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

This commit is contained in:
QMK Bot 2021-08-30 18:23:31 +00:00
commit 3471b2ac89

View File

@ -16,6 +16,7 @@
#include "haptic.h"
#include "process_haptic.h"
#include "quantum_keycodes.h"
#include "action_tapping.h"
__attribute__((weak)) bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {