James Young 4279b14adf Merge remote-tracking branch 'upstream/master' into develop ... Conflicts: keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk keyboards/space_space/rules.mk		2021-08-19 11:32:23 -07:00
..
ajp10304	[Keymap] Quark AJP10304 layout (#13290)	2021-08-19 10:36:20 -07:00
default	[Keyboard] Add SharkPCB rev Alpha support (#7090)	2019-10-24 23:27:43 -07:00
via	Remove Full Bootmagic (#13846)	2021-08-06 23:59:56 -07:00