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

keyboards/matthewdias/m3n3van/keymaps/default/keymap.json

@@ -1,5 +1,5 @@
 {
-  "keyboard": "m3n3van",
+  "keyboard": "matthewdias/m3n3van",
   "keymap": "default",
   "layout": "LAYOUT",
   "layers": [

keyboards/matthewdias/minim/keymaps/default/keymap.json

@@ -1,5 +1,5 @@
 {
-  "keyboard": "minim",
+  "keyboard": "matthewdias/minim",
   "keymap": "default",
   "layout": "LAYOUT",
   "layers": [