Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						8f6b019dcc
					
				
					 353 changed files with 374 additions and 374 deletions
				
			
		| 
						 | 
				
			
			@ -22,4 +22,4 @@ Enter the bootloader in 3 ways:
 | 
			
		|||
 | 
			
		||||
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard.
 | 
			
		||||
* **Physical reset button**: Briefly short cut the *RST* pin with the *GND* pin (pin at the topside of the *RST*) on the back of the PCB.
 | 
			
		||||
* **Keycode in layout**: Press the key mapped to `RESET` if it is available.
 | 
			
		||||
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
 | 
			
		||||
| 
						 | 
				
			
			@ -22,4 +22,4 @@ Enter the bootloader in 3 ways:
 | 
			
		|||
 | 
			
		||||
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard.
 | 
			
		||||
* **Physical reset button**: Briefly short cut the *RST* pin with the *GND* pin (pin at the topside of the *RST*) on the back of the PCB.
 | 
			
		||||
* **Keycode in layout**: Press the key mapped to `RESET` if it is available.
 | 
			
		||||
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue