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

This commit is contained in:
QMK Bot 2020-11-28 05:10:43 +00:00
commit 8fc8a940b9

View file

@ -38,7 +38,7 @@
{"label":"k27", "x":8, "y":2}, {"label":"k27", "x":8, "y":2},
{"label":"k28", "x":9, "y":2}, {"label":"k28", "x":9, "y":2},
{"label":"k29", "x":10, "y":2}, {"label":"k29", "x":10, "y":2},
{"label":"k2a", "x":11, "y":1}, {"label":"k2a", "x":11, "y":2},
{"label":"k30", "x":0, "y":3}, {"label":"k30", "x":0, "y":3},
{"label":"k31", "x":1, "y":3}, {"label":"k31", "x":1, "y":3},
{"label":"k32", "x":2, "y":3}, {"label":"k32", "x":2, "y":3},