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

keyboards/uzu42/rev1/keyboard.json

@@ -4,7 +4,7 @@
   "url": "https://github.com/nrtkbb/Keyboards/tree/master/uzu42",
   "maintainer": "nrtkbb",
   "usb": {
-    "vid": "0xFEED",
+    "vid": "0x6E74",
     "pid": "0x3060",
     "device_version": "0.0.1"
   },