Merge remote-tracking branch 'qmk/master' into merge-2023-06-03

2023-06-03 12:35:25 -06:00
parent abe4b76351 f4a608255a
commit d6e95213e3
14389 changed files with 536595 additions and 476101 deletions
--- a/quantum/action_layer.c
+++ b/quantum/action_layer.c
@ -2,8 +2,8 @@
 #include <stdint.h>

 #include "keyboard.h"
-#include "keymap.h"
 #include "action.h"
+#include "encoder.h"
 #include "util.h"
 #include "action_layer.h"