Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						80d8c4a483
					
				
					 78 changed files with 2856 additions and 731 deletions
				
			
		| 
						 | 
				
			
			@ -26,3 +26,8 @@
 | 
			
		|||
    //Always send Escape if Control is pressed
 | 
			
		||||
 | 
			
		||||
#define TAPPING_TERM 180
 | 
			
		||||
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
 | 
			
		||||
    #define RGB_DISABLE_WHEN_USB_SUSPENDED true
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue