Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						add459f0ac
					
				
					 5 changed files with 89 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -48,8 +48,8 @@
 | 
			
		|||
                {"x": 19.5, "y": 1.25},
 | 
			
		||||
                {"x": 20.5, "y": 1.25},
 | 
			
		||||
                {"x": 21.5, "y": 1.25},
 | 
			
		||||
                {"x": 0, "y": 2.25, "w": 1.5},
 | 
			
		||||
 | 
			
		||||
                {"x": 0, "y": 2.25, "w": 1.5},
 | 
			
		||||
                {"x": 1.5, "y": 2.25},
 | 
			
		||||
                {"x": 2.5, "y": 2.25},
 | 
			
		||||
                {"x": 3.5, "y": 2.25},
 | 
			
		||||
| 
						 | 
				
			
			@ -62,7 +62,7 @@
 | 
			
		|||
                {"x": 10.5, "y": 2.25},
 | 
			
		||||
                {"x": 11.5, "y": 2.25},
 | 
			
		||||
                {"x": 12.5, "y": 2.25},
 | 
			
		||||
                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 | 
			
		||||
 | 
			
		||||
                {"x": 15.25, "y": 2.25},
 | 
			
		||||
                {"x": 16.25, "y": 2.25},
 | 
			
		||||
                {"x": 17.25, "y": 2.25},
 | 
			
		||||
| 
						 | 
				
			
			@ -84,6 +84,7 @@
 | 
			
		|||
                {"x": 10.75, "y": 3.25},
 | 
			
		||||
                {"x": 11.75, "y": 3.25},
 | 
			
		||||
                {"x": 12.75, "y": 3.25},
 | 
			
		||||
                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 | 
			
		||||
                {"x": 18.5, "y": 3.25},
 | 
			
		||||
                {"x": 19.5, "y": 3.25},
 | 
			
		||||
                {"x": 20.5, "y": 3.25},
 | 
			
		||||
| 
						 | 
				
			
			@ -106,7 +107,7 @@
 | 
			
		|||
                {"x": 19.5, "y": 4.25},
 | 
			
		||||
                {"x": 20.5, "y": 4.25},
 | 
			
		||||
                {"x": 21.5, "y": 4.25, "h": 2},
 | 
			
		||||
                
 | 
			
		||||
 | 
			
		||||
                {"x": 0, "y": 5.25, "w": 1.25},
 | 
			
		||||
                {"x": 1.25, "y": 5.25, "w": 1.25},
 | 
			
		||||
                {"x": 2.5, "y": 5.25, "w": 1.25},
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -44,8 +44,8 @@
 | 
			
		|||
                {"x": 19.5, "y": 1.25},
 | 
			
		||||
                {"x": 20.5, "y": 1.25},
 | 
			
		||||
                {"x": 21.5, "y": 1.25},
 | 
			
		||||
                {"x": 0, "y": 2.25, "w": 1.5},
 | 
			
		||||
 | 
			
		||||
                {"x": 0, "y": 2.25, "w": 1.5},
 | 
			
		||||
                {"x": 1.5, "y": 2.25},
 | 
			
		||||
                {"x": 2.5, "y": 2.25},
 | 
			
		||||
                {"x": 3.5, "y": 2.25},
 | 
			
		||||
| 
						 | 
				
			
			@ -58,7 +58,6 @@
 | 
			
		|||
                {"x": 10.5, "y": 2.25},
 | 
			
		||||
                {"x": 11.5, "y": 2.25},
 | 
			
		||||
                {"x": 12.5, "y": 2.25},
 | 
			
		||||
                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 | 
			
		||||
                {"x": 15.25, "y": 2.25},
 | 
			
		||||
                {"x": 16.25, "y": 2.25},
 | 
			
		||||
                {"x": 17.25, "y": 2.25},
 | 
			
		||||
| 
						 | 
				
			
			@ -80,6 +79,7 @@
 | 
			
		|||
                {"x": 10.75, "y": 3.25},
 | 
			
		||||
                {"x": 11.75, "y": 3.25},
 | 
			
		||||
                {"x": 12.75, "y": 3.25},
 | 
			
		||||
                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 | 
			
		||||
                {"x": 18.5, "y": 3.25},
 | 
			
		||||
                {"x": 19.5, "y": 3.25},
 | 
			
		||||
                {"x": 20.5, "y": 3.25},
 | 
			
		||||
| 
						 | 
				
			
			@ -102,7 +102,7 @@
 | 
			
		|||
                {"x": 19.5, "y": 4.25},
 | 
			
		||||
                {"x": 20.5, "y": 4.25},
 | 
			
		||||
                {"x": 21.5, "y": 4.25, "h": 2},
 | 
			
		||||
                
 | 
			
		||||
 | 
			
		||||
                {"x": 0, "y": 5.25, "w": 1.25},
 | 
			
		||||
                {"x": 1.25, "y": 5.25, "w": 1.25},
 | 
			
		||||
                {"x": 2.5, "y": 5.25, "w": 1.25},
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue