mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						78f7c7bb0d
					
				@ -1,5 +1,5 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "keyboard": "m3n3van",
 | 
					  "keyboard": "matthewdias/m3n3van",
 | 
				
			||||||
  "keymap": "default",
 | 
					  "keymap": "default",
 | 
				
			||||||
  "layout": "LAYOUT",
 | 
					  "layout": "LAYOUT",
 | 
				
			||||||
  "layers": [
 | 
					  "layers": [
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,5 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "keyboard": "minim",
 | 
					  "keyboard": "matthewdias/minim",
 | 
				
			||||||
  "keymap": "default",
 | 
					  "keymap": "default",
 | 
				
			||||||
  "layout": "LAYOUT",
 | 
					  "layout": "LAYOUT",
 | 
				
			||||||
  "layers": [
 | 
					  "layers": [
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user