Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts: lib/python/qmk/tests/test_cli_commands.py util/install/fedora.sh
This commit is contained in:
		
						commit
						6955c5a002
					
				
					 22 changed files with 70 additions and 78 deletions
				
			
		| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
#!/bin/bash
 | 
			
		||||
 | 
			
		||||
_qmk_install_prepare() {
 | 
			
		||||
    pacman -Syu
 | 
			
		||||
    pacman -Syu $MSYS2_CONFIRM
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
_qmk_install() {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue