Merge remote-tracking branch 'origin/master' into develop
Add stm32-dfu and apm32-dfu to bootloader.mk (#11019) * Add stm32-dfu and apm32-dfu to bootloader.mk * Update flashing docs * Update comment * Further wordsmithing
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Leafcutterlabs (#11464) * add support for bigknob Add support for bigknob macropad * corrected files * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> * corrected tap dance * Update config.h * correct image link * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * added GPL headers * Update readme.md * update rules to disable tap dance * remove tap dance * Update rules.mk trying to get to pass travis test * Update rules.mk remove tap dance Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
Improve the Lighting Layers example in RGB Lighting docs (#11454) * Improve the keymap layer state -> lighting layers example * A few more improvements
Merge remote-tracking branch 'origin/master' into develop
Fix wrong key when "Music Map" is used with MAJOR_MODE. (#11234) With MAJOR_MODE (= major scale), keys in one octave is not 12 but 7. To solve this problem, change divisor number from 12 to 7 at %(Modulo) and /(Division). NOTE: The last 12 represents half step keys in one octave for pitch calculation.
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Add Mesa TKL (#11294) * Add keyboard: Mesa TKL * Fix image link in readme * Update keyboards/mesa/mesa_tkl/mesa_tkl.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mesa/mesa_tkl/rules.mk White space changes Co-authored-by: Ryan <fauxpark@gmail.com> * Replace tabs with spaces per C coding conventions. * Update keyboards/mesa/mesa_tkl/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
Update info.json - Program Yoink (#11558) * Update info.json Fix ortho_split
Merge remote-tracking branch 'origin/master' into develop
Remove `DESCRIPTION`, W-Z (#11633)
Merge remote-tracking branch 'origin/master' into develop
Remove `DESCRIPTION`, R-V (#11632)
Merge remote-tracking branch 'origin/master' into develop
Remove `DESCRIPTION`, N-Q (#11631)
Switch to nano specs on ChibiOS builds - Round 2 (#11607)
Merge remote-tracking branch 'upstream/master' into develop