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
..
alexmarmon
andrebrait	[Keymap] Improve andrebrait keymap (#13985)	2021-08-13 11:33:04 -07:00
default	[Keymap] Add andrebrait layout for GMMK Pro (#13932)	2021-08-12 06:55:19 -07:00
jonavin	Merge remote-tracking branch 'upstream/master' into develop	2021-08-19 11:32:23 -07:00
paddlegame	Created "paddlegame" keymap (#13629)	2021-08-18 08:43:27 +10:00
via	[Keymap] Add andrebrait layout for GMMK Pro (#13932)	2021-08-12 06:55:19 -07:00
wholesomeducky
willwm	Remove deprecated callbacks for encoders and dip switches (#13404)	2021-07-24 00:37:19 -07:00