ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit 4279b14adf
No known key found for this signature in database
GPG key ID: 8ECFD4391110BC1B
139 changed files with 6481 additions and 447 deletions
Download patch file Download diff file Expand all files Collapse all files

2
keyboards/planck/keymaps/ajp10304/readme.md
View file

@ -1,5 +1,5 @@
# AJP10304 Custom Planck Layout
# Also available for the Shark, JJ40 and Atreus50
# Also available for the Shark, 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.