Fix bad PR merge for #6580. (#12721)

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

add default folder to standard (#12712)

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

YMDK Wings: Update config.h (#12718)

Adds Caps Lock LED indicator configuration.

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

Add flashing instructions to GMMK Pro readme (#12719)

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

GMMK Pro: Fixed Bootmagic Lite support; personal keymap; VIA support (#12554)

* Added WholesomeDucky keymap for GMMK Pro

* Finalized keymap & added 1000hz polling for GMMK Pro

* Corrected for RAlt and Fn being swapped

* Fixed RAlt and Fn being swapped in the layout definition. Updated personal keymap to reflect fixed layout.

* Removed an old comment from personal keymap for GMMK Pro

* added VIA support

* Defined bootmagic row and column for GMMK Pro Esc key

* Update keyboards/gmmk/pro/config.h

* Update keyboards/gmmk/pro/keymaps/via/keymap.c

* Update keyboards/gmmk/pro/keymaps/via/keymap.c

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

Add Draculad keyboard (#12604)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: mangoiv <mangoiv@outlook.com>

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

GMMK Pro: add RESET binding, fix layout macro bug (#12684)

* add RESET binding, fix layout mod key bug (fixes #12683)

* remove underscore #define and use core's instead

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

Update noroadsleft userspace and keymaps (2021-04-26) (#12711)

* Update noroadsleft userspace and keymaps (2021-04-26)

- add Discipline keymap
- move Emulated Non-US Backslash, Numeric Keypad and F13-F24 code fully to userspace
- re-add some custom keycode handling I accidentally deleted
- update VRSN keycode
- update KC60 and userspace readmes

* remove Git readme from kc60 keymap

* update kc60:noroadsleft readme

Concatenates this readme into one file, and updates the image links.

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

Add python-version to gitignore (#12678)

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

[Keyboard] fix planck light via endpoints (#12701)

Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: JuanTapMan <68515848+JuanTapMan@users.noreply.github.com>