sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
	keyboards/space_space/rules.mk
This commit is contained in:
James Young
2021-08-19 11:32:23 -07:00
parent 9d1c98c891 f4f679779e
commit 4279b14adf
139 changed files with 6481 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/acheron/shark/keymaps/ajp10304/readme.md
View File

@@ -1,5 +1,5 @@
# AJP10304 Custom Shark Layout
# Also available for the Planck, JJ40 and Atreus50
# Also available for the Planck, Quark, JJ40 and Atreus50
**Note:** In the tables below where there are two characters on a key,
the second is the output when shift is applied.