Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		@@ -5,7 +5,7 @@
 | 
			
		||||
    "width": 15,
 | 
			
		||||
    "height": 3,
 | 
			
		||||
    "layouts": {
 | 
			
		||||
        "LAYOUT": {
 | 
			
		||||
        "LAYOUT_split_3x6_1": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0},                                 {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0},
 | 
			
		||||
                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1},                                 {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1},
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user