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

..

gtm

[Keyboard] Add GTM Pad macropad (#7123)

2019-10-23 21:36:40 -07:00

m0116b

Remove HD44780 References, Part 4 (#10735)

2020-11-15 08:35:14 -08:00

neiso

Remove HD44780 References, Part 4 (#10735)

2020-11-15 08:35:14 -08:00

osa

Merge remote-tracking branch 'origin/master' into develop

2020-11-22 08:28:53 -08:00