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

keyboards/ploopyco/trackball_nano/keymaps/default/readme.md

@@ -1,3 +1 @@
-The default keymap for the Ploopy Trackball Mini.
-
-Note that kits bought from PloopyCo actually ship with the VIA keymap, not this one.
+The default keymap for the Ploopy Trackball Nano.