Commit Graph

2 Commits (bdd0a6c09789e3e4380f4351f1f83004542d309f)

Author SHA1 Message Date
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
qpockets c98e1694fb
[Keyboard] update space_space keyboard (#13305)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-19 10:17:01 -07:00