Zach White 44d322623e Merge remote-tracking branch 'origin/master' into develop ... Resolved Conflicts: keyboards/checkerboards/nop60/info.json		2021-07-14 10:30:28 -07:00
..
alexmarmon	[Keymap] add simple gmmk pro macos keymap with rgb (#13504)	2021-07-12 09:36:24 -07:00
default	2021 May 29 Breaking Changes Update (#13034)	2021-05-29 14:38:50 -07:00
iso	[Keyboard} Add ISO support for the GMMK Pro (#13532)	2021-07-13 16:50:17 -07:00
jonavin	[Keymap] gmmk pro keymap with numpad, enhanced encoder functionality and Win key lock (#13406)	2021-07-03 01:36:38 -07:00
via	2021 May 29 Breaking Changes Update (#13034)	2021-05-29 14:38:50 -07:00
wholesomeducky	2021 May 29 Breaking Changes Update (#13034)	2021-05-29 14:38:50 -07:00
willwm	[Keymap] gmmk/pro: willwm (#12952)	2021-06-24 12:54:44 +10:00