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

keyboards/kbdfans/kbdpad_mk2/config.h

@@ -47,7 +47,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define LED_CAPS_LOCK_PIN B4
+#define LED_NUM_LOCK_PIN B4
 #define LED_PIN_ON_STATE 0
 
 #define BACKLIGHT_PIN B7