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
						d4f8b478aa
					
				@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    "config": { "features": {"tri_layer": true} },
 | 
					    "config": { "features": {"tri_layer": true} },
 | 
				
			||||||
    "keyboard": "keebio/iris",
 | 
					    "keyboard": "keebio/iris/rev8",
 | 
				
			||||||
    "keymap": "default",
 | 
					    "keymap": "default",
 | 
				
			||||||
    "layout": "LAYOUT",
 | 
					    "layout": "LAYOUT",
 | 
				
			||||||
    "layers": [
 | 
					    "layers": [
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    "config": { "features": {"encoder_map": true, "tri_layer": true} },
 | 
					    "config": { "features": {"encoder_map": true, "tri_layer": true} },
 | 
				
			||||||
    "keyboard": "keebio/irispad",
 | 
					    "keyboard": "keebio/irispad/rev8",
 | 
				
			||||||
    "keymap": "default",
 | 
					    "keymap": "default",
 | 
				
			||||||
    "layout": "LAYOUT",
 | 
					    "layout": "LAYOUT",
 | 
				
			||||||
    "layers": [
 | 
					    "layers": [
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    "config": { "features": {"encoder_map": true, "via": true} },
 | 
					    "config": { "features": {"encoder_map": true, "via": true} },
 | 
				
			||||||
    "keyboard": "keebio/irispad",
 | 
					    "keyboard": "keebio/irispad/rev8",
 | 
				
			||||||
    "keymap": "via",
 | 
					    "keymap": "via",
 | 
				
			||||||
    "layout": "LAYOUT",
 | 
					    "layout": "LAYOUT",
 | 
				
			||||||
    "layers": [
 | 
					    "layers": [
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user