Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
33384a3663
1 changed files with 2 additions and 3 deletions
|
@ -100,7 +100,7 @@
|
||||||
{"x": 10, "y": 8}
|
{"x": 10, "y": 8}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
"LAYOUT_6x6_5_thumb": {
|
"LAYOUT_6x6_5_thumb": {
|
||||||
"layout": [
|
"layout": [
|
||||||
{"x": 0, "y": 0},
|
{"x": 0, "y": 0},
|
||||||
|
@ -180,8 +180,7 @@
|
||||||
{"x": 14, "y": 5},
|
{"x": 14, "y": 5},
|
||||||
|
|
||||||
{"x": 4, "y": 6},
|
{"x": 4, "y": 6},
|
||||||
|
{"x": 12, "y": 6},
|
||||||
{"x": 11, "y": 6},
|
|
||||||
|
|
||||||
{"x": 6, "y": 7},
|
{"x": 6, "y": 7},
|
||||||
{"x": 7, "y": 7},
|
{"x": 7, "y": 7},
|
||||||
|
|
Loading…
Reference in a new issue