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

Resolved Conflicts: keyboards/checkerboards/nop60/info.json
2021-07-14 10:30:28 -07:00
parent 52cfc9259b ffdfe3798b
commit 44d322623e
168 changed files with 10369 additions and 1476 deletions
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
@@ -5,7 +5,7 @@
    "width": 18.25,
    "height": 6.25,
    "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
            "layout": [
                {"label":"K00", "x":0, "y":0},
                {"label":"K01", "x":2, "y":0},
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
@@ -5,7 +5,7 @@
    "width": 18.25,
    "height": 6.25,
    "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
            "layout": [
                {"label":"K00", "x":0, "y":0},
                {"label":"K01", "x":2, "y":0},