Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						23c4704123
					
				| @ -108,12 +108,12 @@ | |||||||
|                 {"matrix": [5, 2], "x": 2.75, "y": 5, "w": 1.5}, |                 {"matrix": [5, 2], "x": 2.75, "y": 5, "w": 1.5}, | ||||||
|                 {"matrix": [5, 3], "x": 4.25, "y": 5, "w": 1.5}, |                 {"matrix": [5, 3], "x": 4.25, "y": 5, "w": 1.5}, | ||||||
|                 {"matrix": [5, 4], "x": 5.75, "y": 5,"w": 2}, |                 {"matrix": [5, 4], "x": 5.75, "y": 5,"w": 2}, | ||||||
|                 {"matrix": [5, 5], "x": 7.75, "y": 5,"w": 1.5}, |                 {"matrix": [5, 6], "x": 7.75, "y": 5,"w": 1.5}, | ||||||
|                 {"matrix": [5, 6], "x": 9.25, "y": 5}, |                 {"matrix": [5, 7], "x": 9.25, "y": 5}, | ||||||
|                 {"matrix": [5, 7], "x": 10.25, "y": 5}, |                 {"matrix": [5, 8], "x": 10.25, "y": 5}, | ||||||
|                 {"matrix": [5, 8], "x": 11.25, "y": 5}, |                 {"matrix": [5, 9], "x": 11.25, "y": 5}, | ||||||
|                 {"matrix": [5, 9], "x": 12.25, "y": 5}, |                 {"matrix": [5, 10], "x": 12.25, "y": 5}, | ||||||
|                 {"matrix": [5, 10], "x": 13.25, "y": 5,"w": 1.25} |                 {"matrix": [5, 11], "x": 13.25, "y": 5,"w": 1.25} | ||||||
|             ] |             ] | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user