Merge remote-tracking branch 'origin/master' into develop · f5aaecfdfc - HuiJun's Git Server

Merge remote-tracking branch 'origin/master' into develop

QMK Bot 4 年之前

父节点

ebdf750cdd 1a7a821582

当前提交

f5aaecfdfc

共有 1 个文件被更改，包括 2 次插入 和 1 次删除

分列视图显示文件统计

						
							+ 2
							
							- 1
						
keyboards/mechwild/mercutio/keymaps/bongocat/rules.mk
							 
								查看文件
							
				@@ -1,2 +1,3 @@
			
				 WPM_ENABLE = yes
			
				-VIA_ENABLE = yes
			
				+VIA_ENABLE = yes
			
				+MOUSEKEY_ENABLE = no