2 commits

Author	SHA1	Message	Date
Zach White	ac3b7d79e0	Merge remote-tracking branch 'origin/master' into develop ... Resolved Conflicts: keyboards/kc60/rules.mk keyboards/xd96/rules.mk lib/python/qmk/cli/__init__.py	2020-11-22 08:28:53 -08:00
Evy Dekkers	b968a53c7e	Maartenwut/Maarten namechange to evyd13/Evy (#10274)	2020-11-01 09:40:51 -08:00