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

quantum/quantum_keycodes.h

@@ -332,11 +332,11 @@ enum quantum_keycodes {
 
     MIDI_VELOCITY_MIN,
     MI_VEL_0 = MIDI_VELOCITY_MIN,
-#ifdef VIA_ENABLE
+#    ifdef VIA_ENABLE
     MI_VEL_1 = MIDI_VELOCITY_MIN,
-#else
+#    else
     MI_VEL_1,
-#endif
+#    endif
     MI_VEL_2,
     MI_VEL_3,
     MI_VEL_4,

tmk_core/common/keycode.h

@@ -523,7 +523,7 @@ enum internal_special_keycodes {
 };
 
 enum mouse_keys {
-    /* Mouse Buttons */
+/* Mouse Buttons */
 #ifdef VIA_ENABLE
     KC_MS_UP = 0xF0,
 #else