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

17 files changed, 1 insertions, 1 deletions

diff --git a/keyboards/gmmk/pro/keymaps/jackkenney/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/jackkenney/keymap.c
index cfca7960ca..cfca7960ca 100644
--- a/keyboards/gmmk/pro/keymaps/jackkenney/keymap.c
+++ b/keyboards/gmmk/pro/ansi/keymaps/jackkenney/keymap.c
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/.gitignore b/keyboards/gmmk/pro/ansi/keymaps/mike1808/.gitignore
index 03b2b46668..03b2b46668 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/.gitignore
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/.gitignore
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/README.md b/keyboards/gmmk/pro/ansi/keymaps/mike1808/README.md
index cb17239882..cb17239882 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/README.md
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/README.md
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/config.h b/keyboards/gmmk/pro/ansi/keymaps/mike1808/config.h
index 46719e3a78..46719e3a78 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/config.h
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/config.h
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/encoder.c b/keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.c
index 049f4df7e4..049f4df7e4 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/encoder.c
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.c
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/encoder.h b/keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.h
index 204922730e..204922730e 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/encoder.h
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.h
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/fun.c b/keyboards/gmmk/pro/ansi/keymaps/mike1808/fun.c
index f553874eb0..f553874eb0 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/fun.c
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/fun.c
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/mike1808/keymap.c
index 30c59e941d..30c59e941d 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/keymap.c
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/keymap.c
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/mike1808.c b/keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.c
index 8813846096..dda68fda2f 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/mike1808.c
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.c
@@ -20,7 +20,7 @@
 #else
 // `PROGMEM const char secret[][x]` may work better, but it takes up more space in the firmware
 // And I'm not familiar enough to know which is better or why...
-static const char *const secret[] = {"test1", "test2", "test3", "test4", "test5"};
+static const char *const secrets[] = {"test1", "test2", "test3", "test4", "test5"};
 #endif
 
 // userspace_config_t userspace_config;
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/mike1808.h b/keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.h
index bc010108fb..bc010108fb 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/mike1808.h
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.h
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/process_record.c b/keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.c
index ac0164e73f..ac0164e73f 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/process_record.c
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.c
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/process_record.h b/keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.h
index 1021751655..1021751655 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/process_record.h
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.h
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/rgb_matrix_ledmaps.c b/keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
index 6f4d333ede..6f4d333ede 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/rgb_matrix_ledmaps.c
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/rgb_matrix_ledmaps.h b/keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
index eace217d18..eace217d18 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/rgb_matrix_ledmaps.h
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/mike1808/rules.mk
index a6d4e6259c..a6d4e6259c 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/rules.mk
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/rules.mk
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/utils.c b/keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.c
index 35ae20b126..35ae20b126 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/utils.c
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.c
diff --git a/keyboards/gmmk/pro/keymaps/mike1808/utils.h b/keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.h
index 49d0745cf8..49d0745cf8 100644
--- a/keyboards/gmmk/pro/keymaps/mike1808/utils.h
+++ b/keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.h