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
						7ca0424189
					
				@ -11,8 +11,8 @@
 | 
			
		||||
    "features": {
 | 
			
		||||
        "backlight": true,
 | 
			
		||||
        "bootmagic": false,
 | 
			
		||||
        "command": true,
 | 
			
		||||
        "console": true,
 | 
			
		||||
        "command": false,
 | 
			
		||||
        "console": false,
 | 
			
		||||
        "extrakey": true,
 | 
			
		||||
        "mousekey": false,
 | 
			
		||||
        "nkro": true,
 | 
			
		||||
@ -45,7 +45,6 @@
 | 
			
		||||
            "knight": true,
 | 
			
		||||
            "christmas": true,
 | 
			
		||||
            "static_gradient": true,
 | 
			
		||||
            "rgb_test": true,
 | 
			
		||||
            "alternating": true,
 | 
			
		||||
            "twinkle": true
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user