diff options
| author | Nick Brassel <nick@tzarc.org> | 2021-11-18 07:38:06 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2021-11-18 07:38:06 +1100 |
| commit | 45f4f446fb8473008252756e45023fc11bfe1472 (patch) | |
| tree | 5def968e04ecfff128ef853d61f24e7664dbc76f | |
| parent | 9ec43882cbbf78ed51298ec0a29b77b7797a0348 (diff) | |
| parent | 2c5d66987da4c7d5857cab8b09c4f852b4d8e4d9 (diff) | |
| download | qmk_firmware-45f4f446fb8473008252756e45023fc11bfe1472.tar.gz qmk_firmware-45f4f446fb8473008252756e45023fc11bfe1472.zip | |
Merge remote-tracking branch 'upstream/master' into develop
| -rw-r--r-- | keyboards/checkerboards/phoenix45_ortho/keymaps/via/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/sneakbox/ava/info.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/checkerboards/phoenix45_ortho/keymaps/via/rules.mk b/keyboards/checkerboards/phoenix45_ortho/keymaps/via/rules.mk index 69de2e4c5..1e5b99807 100644 --- a/keyboards/checkerboards/phoenix45_ortho/keymaps/via/rules.mk +++ b/keyboards/checkerboards/phoenix45_ortho/keymaps/via/rules.mk | |||
| @@ -1 +1 @@ | |||
| VIA_ENABLE = yes | VIA_ENABLE = yes | ||
diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json index 55b52a5c5..276efce01 100644 --- a/keyboards/sneakbox/ava/info.json +++ b/keyboards/sneakbox/ava/info.json | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | { | 1 | { |
| 2 | "keyboard_name": "AVA", | 2 | "keyboard_name": "AVA", |
| 3 | "url": "https://sneakbox.com", | 3 | "url": "https://sneakbox.com", |
| 4 | "maintainer": "mujimanic", | 4 | "maintainer": "mujimanic", |