mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-03 23:02:34 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						319031154d
					
				@ -71,7 +71,8 @@
 | 
				
			|||||||
                {"x":12.75, "y":3.25, "w":2.25},
 | 
					                {"x":12.75, "y":3.25, "w":2.25},
 | 
				
			||||||
                {"x":15.25, "y":3.25},
 | 
					                {"x":15.25, "y":3.25},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                {"x":0, "y":4.25, "w":2.25},
 | 
					                {"x":0, "y":4.25, "w":1.25},
 | 
				
			||||||
 | 
					                {"x":1.25, "y":4.25},
 | 
				
			||||||
                {"x":2.25, "y":4.25},
 | 
					                {"x":2.25, "y":4.25},
 | 
				
			||||||
                {"x":3.25, "y":4.25},
 | 
					                {"x":3.25, "y":4.25},
 | 
				
			||||||
                {"x":4.25, "y":4.25},
 | 
					                {"x":4.25, "y":4.25},
 | 
				
			||||||
@ -90,9 +91,8 @@
 | 
				
			|||||||
                {"x":1.25, "y":5.25, "w":1.25},
 | 
					                {"x":1.25, "y":5.25, "w":1.25},
 | 
				
			||||||
                {"x":2.5, "y":5.25, "w":1.25},
 | 
					                {"x":2.5, "y":5.25, "w":1.25},
 | 
				
			||||||
                {"x":3.75, "y":5.25, "w":6.25},
 | 
					                {"x":3.75, "y":5.25, "w":6.25},
 | 
				
			||||||
                {"x":10, "y":5.25},
 | 
					                {"x":10, "y":5.25, "w":1.5},
 | 
				
			||||||
                {"x":11, "y":5.25},
 | 
					                {"x":11.5, "y":5.25, "w":1.5},
 | 
				
			||||||
                {"x":12, "y":5.25},
 | 
					 | 
				
			||||||
                {"x":13.125, "y":5.375},
 | 
					                {"x":13.125, "y":5.375},
 | 
				
			||||||
                {"x":14.125, "y":5.375},
 | 
					                {"x":14.125, "y":5.375},
 | 
				
			||||||
                {"x":15.125, "y":5.375}
 | 
					                {"x":15.125, "y":5.375}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user