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

keyboards/yanghu/unicorne/info.json

@@ -8,8 +8,11 @@
     "pid": "0x0204",
     "device_version": "0.0.1"
   },
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_split_3x6_4"
+  },
   "layouts": {
-    "LAYOUT_unicorne": {
+    "LAYOUT_split_3x6_4": {
       "layout": [
         {"label":"Tab", "x":0, "y":0.8},
         {"label":"Q", "x":1, "y":0.8},
@@ -65,4 +68,4 @@
       ]
     }
   }
-} 
+}