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

keyboards/keychron/q1/ansi_encoder/info.json

@@ -39,8 +39,8 @@
                 {"matrix":[0,11], "x":10.75, "y":0},
                 {"matrix":[0,12], "x":11.75, "y":0},
                 {"matrix":[0,13], "x":12.75, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[4,14], "x":15.25, "y":0},
+                {"matrix":[4,14], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
 
                 {"matrix":[1, 0], "x":0, "y":1},
                 {"matrix":[1, 1], "x":1, "y":1},