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

keyboards/pistachio_pro/info.json

@@ -6,7 +6,8 @@
     "height": 6.5,
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0},
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
                 {"label":"F1", "x":2, "y":0},
                 {"label":"F2", "x":3, "y":0},
                 {"label":"F3", "x":4, "y":0},
@@ -20,6 +21,7 @@
                 {"label":"F11", "x":13, "y":0},
                 {"label":"F12", "x":14, "y":0},
                 {"label":"Pause", "x":17.25, "y":0},
+
                 {"label":"E/J", "x":0, "y":1.5},
                 {"label":"!", "x":1, "y":1.5},
                 {"label":"\"", "x":2, "y":1.5},
@@ -38,6 +40,7 @@
                 {"label":"Insert", "x":15.25, "y":1.5},
                 {"label":"Home", "x":16.25, "y":1.5},
                 {"label":"PgUp", "x":17.25, "y":1.5},
+
                 {"label":"Tab", "x":0, "y":2.5, "w":1.5},
                 {"label":"Q", "x":1.5, "y":2.5},
                 {"label":"W", "x":2.5, "y":2.5},
@@ -51,10 +54,10 @@
                 {"label":"P", "x":10.5, "y":2.5},
                 {"label":"`", "x":11.5, "y":2.5},
                 {"label":"{", "x":12.5, "y":2.5},
-                       {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
                 {"label":"Delete", "x":15.25, "y":2.5},
                 {"label":"End", "x":16.25, "y":2.5},
                 {"label":"PgDn", "x":17.25, "y":2.5},
+
                 {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
                 {"label":"A", "x":1.75, "y":3.5},
                 {"label":"S", "x":2.75, "y":3.5},
@@ -68,6 +71,8 @@
                 {"label":"+", "x":10.75, "y":3.5},
                 {"label":"*", "x":11.75, "y":3.5},
                 {"label":"}", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+
                 {"label":"Shift", "x":0, "y":4.5, "w":2.25},
                 {"label":"Z", "x":2.25, "y":4.5},
                 {"label":"X", "x":3.25, "y":4.5},
@@ -82,6 +87,7 @@
                 {"label":"_", "x":12.25, "y":4.5},
                 {"label":"Shift", "x":13.25, "y":4.5, "w":1.75},
                 {"label":"\u2191", "x":16.25, "y":4.5},
+
                 {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
                 {"label":"Win", "x":1.25, "y":5.5},
                 {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
@@ -95,7 +101,8 @@
                 {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
                 {"label":"\u2190", "x":15.25, "y":5.5},
                 {"label":"\u2193", "x":16.25, "y":5.5},
-                       {"label":"\u2192", "x":17.25, "y":5.5}]
+                {"label":"\u2192", "x":17.25, "y":5.5}
+            ]
         }
     }
 }