Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						8f6b019dcc
					
				
					 353 changed files with 374 additions and 374 deletions
				
			
		| 
						 | 
				
			
			@ -20,6 +20,6 @@ Flashing example for this keyboard:
 | 
			
		|||
Enter the bootloader in 3 ways:
 | 
			
		||||
 | 
			
		||||
* **Bootmagic reset**: Hold down the top left key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 | 
			
		||||
* **Keycode in layout**: Press the key mapped to `RESET` if it is available (Fn+Backslash by default)
 | 
			
		||||
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (Fn+Backslash by default)
 | 
			
		||||
 | 
			
		||||
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue