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
..
decadepad	Merge remote-tracking branch 'origin/master' into develop	2020-11-22 08:28:53 -08:00