Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						7ca0424189
					
				| @ -11,8 +11,8 @@ | |||||||
|     "features": { |     "features": { | ||||||
|         "backlight": true, |         "backlight": true, | ||||||
|         "bootmagic": false, |         "bootmagic": false, | ||||||
|         "command": true, |         "command": false, | ||||||
|         "console": true, |         "console": false, | ||||||
|         "extrakey": true, |         "extrakey": true, | ||||||
|         "mousekey": false, |         "mousekey": false, | ||||||
|         "nkro": true, |         "nkro": true, | ||||||
| @ -45,7 +45,6 @@ | |||||||
|             "knight": true, |             "knight": true, | ||||||
|             "christmas": true, |             "christmas": true, | ||||||
|             "static_gradient": true, |             "static_gradient": true, | ||||||
|             "rgb_test": true, |  | ||||||
|             "alternating": true, |             "alternating": true, | ||||||
|             "twinkle": true |             "twinkle": true | ||||||
|         } |         } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user