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
..
qmk	Merge remote-tracking branch 'origin/master' into develop	2020-11-22 08:28:53 -08:00
kle2xy.py	[kle2info] Trim the code in kle2xy (#8955)	2020-05-15 12:09:22 -07:00