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

..

atom47

Maartenwut/Maarten namechange to evyd13/Evy (#10274)

2020-11-01 09:40:51 -08:00

eon40

Remove HD44780 References, Part 4 (#10735)

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

eon65

Maartenwut/Maarten namechange to evyd13/Evy (#10274)

2020-11-01 09:40:51 -08:00

eon75

Maartenwut/Maarten namechange to evyd13/Evy (#10274)

2020-11-01 09:40:51 -08:00

eon87

Maartenwut/Maarten namechange to evyd13/Evy (#10274)

2020-11-01 09:40:51 -08:00

eon95

Maartenwut/Maarten namechange to evyd13/Evy (#10274)

2020-11-01 09:40:51 -08:00

gh80_1800

Maartenwut/Maarten namechange to evyd13/Evy (#10274)

2020-11-01 09:40:51 -08:00

gh80_3700

Maartenwut/Maarten namechange to evyd13/Evy (#10274)

2020-11-01 09:40:51 -08:00

minitomic

Remove HD44780 References, Part 4 (#10735)

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

mx5160

Remove HD44780 References, Part 4 (#10735)

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

nt660

Remove HD44780 References, Part 4 (#10735)

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

omrontkl

Maartenwut/Maarten namechange to evyd13/Evy (#10274)

2020-11-01 09:40:51 -08:00

plain60

Maartenwut/Maarten namechange to evyd13/Evy (#10274)

2020-11-01 09:40:51 -08:00

pockettype

Maartenwut/Maarten namechange to evyd13/Evy (#10274)

2020-11-01 09:40:51 -08:00

quackfire

Maartenwut/Maarten namechange to evyd13/Evy (#10274)

2020-11-01 09:40:51 -08:00

solheim68

Maartenwut/Maarten namechange to evyd13/Evy (#10274)

2020-11-01 09:40:51 -08:00

ta65

Remove HD44780 References, Part 4 (#10735)

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

wasdat

Remove HD44780 References, Part 4 (#10735)

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

wasdat_code

Remove HD44780 References, Part 4 (#10735)

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

wonderland

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

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