Nick Brassel 9e18f41fcf Merge remote-tracking branch 'upstream/master' into develop

2021-01-20 10:00:28 +11:00

..

keymaps

…

config.h

Remove DESCRIPTION, H-J (#11616)

2021-01-20 00:38:12 +11:00

info.json

[Keyboard] HS60 v2 ISO: fix Configurator key ordering (#7958)

2020-01-24 01:09:55 -08:00

iso.h

…

rules.mk

Add board specific to Proton-C, with usual defaults turned on. (#10976)

2020-12-03 13:04:28 +11:00