Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						24e2466de3
					
				| @ -105,8 +105,8 @@ | ||||
|                 {"matrix": [7, 7], "x": 10.25, "y": 3}, | ||||
|                 {"matrix": [7, 6], "x": 11.25, "y": 3}, | ||||
|                 {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75}, | ||||
|                 {"matrix": [7, 4], "x": 15.5, "y": 3}, | ||||
|                 {"matrix": [7, 3], "x": 14.25, "y": 3.25}, | ||||
|                 {"matrix": [7, 4], "x": 14.25, "y": 3.25}, | ||||
|                 {"matrix": [7, 3], "x": 15.5, "y": 3}, | ||||
|                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, | ||||
|                 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, | ||||
|                 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, | ||||
| @ -174,8 +174,8 @@ | ||||
|                 {"matrix": [7, 7], "x": 10.25, "y": 3}, | ||||
|                 {"matrix": [7, 6], "x": 11.25, "y": 3}, | ||||
|                 {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75}, | ||||
|                 {"matrix": [7, 4], "x": 15.5, "y": 3}, | ||||
|                 {"matrix": [7, 3], "x": 14.25, "y": 3.25}, | ||||
|                 {"matrix": [7, 4], "x": 14.25, "y": 3.25}, | ||||
|                 {"matrix": [7, 3], "x": 15.5, "y": 3}, | ||||
|                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, | ||||
|                 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, | ||||
|                 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user