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

miryoku-merge-master
QMK Bot 5 years ago
commit c680c84a31

@ -373,7 +373,7 @@ void oled_task_user(void) {
bool process_record_kb(uint16_t keycode, keyrecord_t *record) { bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
sleep_timer = timer_read32(); sleep_timer = timer_read32();
return true; return process_record_user(keycode, record);
} }
#endif #endif

Loading…
Cancel
Save