Zach White 44d322623e Merge remote-tracking branch 'origin/master' into develop ...

Resolved Conflicts:
	keyboards/checkerboards/nop60/info.json

2021-07-14 10:30:28 -07:00

..

axon40

Fix up recent checkerboards additions (#13414)

2021-07-02 14:00:55 +01:00

candybar_ortho

[Keyboard] add ortho Candybar and NOP60 PCBs (#12807)

2021-05-13 09:36:12 -07:00

g_idb60

Fix up recent checkerboards additions (#13414)

2021-07-02 14:00:55 +01:00

nop60

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

2021-07-14 10:30:28 -07:00