adaaee4edf
[Keyboard] Add xox70hot ( #15632 )
2022-01-10 17:07:09 -08:00
79f2fca1f9
Merge remote-tracking branch 'origin/master' into develop
2022-01-11 00:58:16 +00:00
dce611bc9f
[Keymap] AJP10304 layout, add Colemak-DHm layer ( #15582 )
2022-01-10 16:57:41 -08:00
34602f4b25
[Keyboard] move reviung keyboards to a directory ( #15636 )
2022-01-10 16:57:20 -08:00
2b212cf692
[Keyboard] Rename ymdk_np21 to np21, move to ymdk vendor folder ( #15641 )
2022-01-10 16:56:59 -08:00
65e7d0c01f
[Keyboard] move ymd96 to ymdk vendor folder ( #15643 )
2022-01-10 16:55:58 -08:00
c08ed73216
[Keyboard] move ymd75 to ymdk vendor folder ( #15645 )
2022-01-10 16:55:37 -08:00
db608aae51
Merge remote-tracking branch 'origin/master' into develop
2022-01-11 00:54:24 +00:00
101f504435
[Keyboard] Rename Laptreus to Shapeshifter4060 ( #15655 )
2022-01-10 16:53:54 -08:00
bc617d8ad1
Merge remote-tracking branch 'origin/master' into develop
2022-01-11 00:53:34 +00:00
dd4e48b4a2
[Keymap] dvorak 42 key layouts (Ergodox EZ / Atreus) updates ( #15656 )
...
Co-authored-by: luc wastiaux <luc.wastiaux@airpost.net>
2022-01-10 16:52:54 -08:00
a5a3918856
Merge remote-tracking branch 'origin/master' into develop
2022-01-11 00:51:40 +00:00
cb821b5f16
[Keymap] fix: moving keymap to rev1 folder ( #15663 )
2022-01-10 16:51:09 -08:00
6ed4f51413
Merge remote-tracking branch 'origin/master' into develop
2022-01-11 00:50:47 +00:00
37ba5e4892
[Keymap] Add new The GMMK PRO keymap ( #15664 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-01-10 16:50:12 -08:00
d7d3839b8d
[Keyboard] move ID80 to IDOBAO vendor folder ( #15665 )
2022-01-10 16:49:50 -08:00
184f4b38c8
Merge remote-tracking branch 'origin/master' into develop
2022-01-11 00:49:20 +00:00
19fe7dcaaa
[Keyboard] Fixed bugs Wuque Mammoth Keyboard Series ( #15700 )
2022-01-10 16:49:19 -08:00
0fc1ae9e9c
[Keyboard] handwired/dactyl_manuform: add 6x7 version ( #15704 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-01-10 16:48:49 -08:00
93149711f6
Merge remote-tracking branch 'origin/master' into develop
2022-01-11 00:45:05 +00:00
ecc06a9700
[Keyboard] Simplify default keymap to Seniply ( #15731 )
2022-01-10 16:45:02 -08:00
cd12b54650
[Keyboard] Added via support for orthocode ( #15777 )
2022-01-10 16:44:18 -08:00
dfecad4362
Merge remote-tracking branch 'origin/master' into develop
2022-01-11 00:42:28 +00:00
b1942d1d0c
[Keyboard] move cu24, cu75, cu80/v1 into capsunlocked folder ( #15758 )
2022-01-10 16:42:13 -08:00
372c9102e2
[Keymap] Jonavin gmmk pro iso keymap ( #15775 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jonavin <=>
2022-01-10 16:41:54 -08:00
93bacff1a6
[Keyboard] move prototypist boards into vendor folder ( #15780 )
2022-01-10 16:40:22 -08:00
36ebc75e9a
[Keyboard] move yiancar's boards into yiancardesigns/ ( #15781 )
2022-01-10 16:39:56 -08:00
a483ab3213
[Keyboard] move novelkeys keyboards to vendor folder ( #15783 )
2022-01-10 16:39:17 -08:00
ced6d835e8
[Keyboard] move weirdo-f's keyboards into weirdo/ ( #15785 )
2022-01-10 16:38:55 -08:00
a2ddb44957
[Keyboard] move marksard's boards to marksard/ ( #15786 )
2022-01-10 16:38:31 -08:00
31a6401193
[Keyboard] move rainkeebs's keyboards to rainkeebs/ ( #15797 )
2022-01-10 16:35:54 -08:00
ceea8ab5fe
[Keyboard] move standaside into edi/ ( #15798 )
2022-01-10 16:35:23 -08:00
f10285d800
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 23:06:51 +00:00
aafbe043f9
[Keyboard] move lyso1 's boards into lyso1/ ( #15767 )
2022-01-10 15:06:37 -08:00
53359ab2ee
[Keyboard] Add Aves60 ( #15770 )
2022-01-10 15:06:19 -08:00
20e16bbcc4
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 23:05:34 +00:00
d9d8526ca2
[Keyboard] Update Cradio readme ( #15784 )
2022-01-10 15:04:54 -08:00
e6e6529b4a
[Keyboard] move Salicylic-acid3's keyboards to salicylic-acid3/ ( #15791 )
2022-01-10 15:03:15 -08:00
4cff18a705
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 23:02:16 +00:00
0b32bddd65
[Keyboard] Add mikeneko65 keyboard ( #15792 )
...
Co-authored-by: takishim <tadashi@kishimo.to>
2022-01-10 15:02:12 -08:00
1a4db497db
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 23:02:04 +00:00
8f630c17b9
[Keymap] Add Fearless Spiff keymap for Mechwild Mercutio based on Bongocat and Jonavin ( #15802 )
2022-01-10 15:01:32 -08:00
5d0c92b40c
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 23:00:33 +00:00
9bcb33f0da
[Keyboard] Fix compilation issues for Dygma Raise ( #15810 )
2022-01-10 15:00:08 -08:00
e014d9897d
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 23:00:06 +00:00
0284639913
[Keyboard] Fix compiled size for Kudox Full keyboard ( #15809 )
2022-01-10 14:59:51 -08:00
e4f0c79413
[Keyboard] Enable RGB Matrix Animations on KBD67 mkIII ISO ( #15808 )
2022-01-10 14:59:33 -08:00
2fbdfae4b7
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 20:36:43 +00:00
2dd7242e99
[Keyboard] Kastenwagen 1840 and Kastenwagen 48 ( #13565 )
...
* cleaning up
* deleting to undelete
* Stub out defaults
* Jabberwocky firmware WIP
* Stubbing out keymap spacing
* Default keymap and layout updates
* start stubbing out JSON for configurator
* more WIP
* Update jabberwocky.h
* Add Readme
* Apply suggestions from code review
* Fix layout capitalization
* Updates to personal and default keymaps
* Add instructions for jumping the bootloader
* Update keyboards/nopunin10did/jabberwocky/rules.mk
* Add easier ctrl-alt-del to my keymap
* Start stubbing out KW firmware
* More firmware and keymap stuff
* Fix compile error
* Filling out other layers in default keymap
* Update layout JSON and finish default layouts
* Add rotary and LED code
* Add VIA support (first draft)
* Move VIA compatibility to VIA-specific branch
* Fix readme formatting
* Fix state count issue in LED code
* Fix an erroneous change to a Jabberwocky file
* Default LEDs to on.
* Apply suggestions from code review
* Delete kastenwagen.json
* Update keyboards/nopunin10did/kastenwagen/config.h
* Apply suggestions from code review
* Apply suggestions from noroadsleft code review
* Update image in the readme
* Split 1840 & 48 into two boards (part 1)
* Splitting into two keyboards (part 2)
2022-01-10 12:36:02 -08:00
017c26c167
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 20:33:24 +00:00
0e11f8ec20
[Keyboard] TKC California ( #15124 )
...
* CALIFORNIA: Initial support for TKC California
* update readme.md, info.json
* Update keyboards/tkc/california/rules.mk
* Update keyboards/tkc/california/rules.mk
* Update keyboards/tkc/california/readme.md
* Update keyboards/tkc/california/rules.mk
* Update keyboards/tkc/california/info.json
2022-01-10 12:32:46 -08:00
0b4afdf35b
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 20:16:17 +00:00
f423837ed2
[Keyboard] M48 12x4 lego ortholinear keyboard ( #15536 )
2022-01-10 12:15:28 -08:00
371fc8c062
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 19:06:34 +00:00
23ba884fa0
[Keyboard] add dz64rgb support ( #15553 )
...
* add dz64rgb support
* Update keyboards/dztech/dz64rgb/dz64rgb.c
* Update keyboards/dztech/dz64rgb/rules.mk
* Update keyboards/dztech/dz64rgb/dz64rgb.c
* Update keyboards/dztech/dz64rgb/rules.mk
* Update keyboards/dztech/dz64rgb/rules.mk
* Update keyboards/dztech/dz64rgb/rules.mk
2022-01-10 11:05:53 -08:00
d52dca47e8
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 19:00:14 +00:00
50d46b5003
[Keyboard] add kbd75rgb support ( #15552 )
...
* add kbd75rgb support
* Update keyboards/kbdfans/kbd75rgb/config.h
* Update keyboards/kbdfans/kbd75rgb/rules.mk
* Update keyboards/kbdfans/kbd75rgb/rules.mk
* Update keymap.c
* Update keymap.c
* Update readme.md
* Update keyboards/kbdfans/kbd75rgb/config.h
* Update keyboards/kbdfans/kbd75rgb/config.h
* Update keyboards/kbdfans/kbd75rgb/config.h
* Update keyboards/kbdfans/kbd75rgb/rules.mk
* Update keyboards/kbdfans/kbd75rgb/rules.mk
* Update keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c
* Update keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c
* Update keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c
* Update keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c
* Update keyboards/kbdfans/kbd75rgb/rules.mk
2022-01-10 10:59:42 -08:00
b4b636112e
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 10:34:22 +00:00
2e19d0d7d1
[Keyboard] Add Buzzard support ( #15493 )
...
* add buzzerd
(untested, WIP)
* configured linear actuator and fixed keymap
* configuration tweaks and added custom keymap
* add custom tapping term for home row mod
* added readme
* remove ionide folder
* added scroll function to trackpoint
* keymap reworked
* using one shot shift and removed dynamic macros
* reworked default keymap
* adapted to latest qmk changes
* remove caps word from default keymap
* use provided coding guidelines
* use get_highest_layer in favour of biton32
* fixed formatting
* remove unnecessary define statement
2022-01-10 02:33:48 -08:00
5491385f3d
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 10:33:15 +00:00
d7eb09949d
[Keyboard] Add keymap and settings for dactyl_manuform 6x6_5 thumb ( #15526 )
...
* Add dactyl manu 6x6 with stm32 support and 5thumb cluster
* Add review changes
* Add license to new files
* Fix enums for custom keymap
* Readme update
* Fix readme to follow one from template
* Add missing licence to files
* Update keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
* Update keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
* Remove readme from onekey keyboard
* Make separate macro for 5thumb
2022-01-10 02:31:51 -08:00
437dad1b0e
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 10:22:38 +00:00
f59cbfb75c
[Keyboard] Added Handwired Redragon K552 Kumara (RGB) ( #14004 )
...
* Added Handwired Redragon K552 with default and via keymaps
* Resolve some request changes, and change the cols pin to a better one.
* Resolved request changes
* Added OLED support and resolve request change
* Increase polling rate to 1000hz
* Update font for OLED, and change logo
* Added LED Underglow support
* Add personal custom keymap
* Nit some line, to get better way to look on code
* Refactor everything and solved some issue.
* Resolved issue
2022-01-10 02:21:53 -08:00
13a44b1fff
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 09:26:59 +00:00
c5728aebee
Add Teensy2.0++ revision and VIA keymap to handwired/sono1 ( #15296 )
...
* teensy2.0pp revision, via support
* updated documentation
* Update keyboards/handwired/sono1/t2pp/rules.mk
2022-01-10 01:26:06 -08:00
89260bab86
Merge remote-tracking branch 'origin/master' into develop
2022-01-10 09:14:12 +00:00
d9e5a5f2db
[Keymap] bongocat_wpm_responsive for lily58 ( #14922 )
...
* Adding the keymap of the wpm responsive bongocat
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/rules.mk
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
* Adding the License
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/rules.mk
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
2022-01-10 01:13:35 -08:00
9682abd5b8
Merge remote-tracking branch 'origin/master' into develop
2022-01-09 20:08:56 +00:00
1ed5c48d93
[Keyboard] Add RGB Matrix support to id67 and add thewerther keymap ( #15558 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: sigprof and fauxpark
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-01-09 12:08:18 -08:00
69b211abb6
Merge remote-tracking branch 'origin/master' into develop
2022-01-09 19:57:38 +00:00
ec78acae69
[Keyboard] Adding Dygma Raise ( #13543 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-01-09 11:57:08 -08:00
78dba27922
Merge remote-tracking branch 'origin/master' into develop
2022-01-09 18:22:39 +00:00
8e17f9911d
[Keymap] Ardakilic keymap for crkbd added ( #13745 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-01-09 10:21:54 -08:00
515eb94fab
Merge remote-tracking branch 'origin/master' into develop
2022-01-09 17:45:14 +00:00
1df390c34f
[Keyboard] Add Meck TKL handwired ( #15533 )
...
* Add meck_tkl
* Fix configuration and pin assignment
* Rellocate A10 pin, as it is used by the USB DFU bootloader
* Add volume and media keys to the function keys layer
* Rellocate source files to the handwired keyboards folder and add documentation
* Review changes for PR
- Improve LAYOUT macro to match the keyboard layout.
- Use "kxy" as pin names on the LAYOUT macro.
- Remove unused mcuconf.h and halconf.h.
- Fix README.
* Improve layout macro naming
2022-01-09 09:44:33 -08:00
30d060417f
Merge remote-tracking branch 'origin/master' into develop
2022-01-09 04:03:19 +00:00
7b27957adf
[Keyboard] Delete lyra (located in malevolti/lyra) ( #15524 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-01-08 20:02:45 -08:00
9578b4b570
Merge remote-tracking branch 'origin/master' into develop
2022-01-09 03:58:05 +00:00
70469d373d
[Keyboard] Add MMKZOO65 PCB ( #15546 )
...
* Add MMKZOO65 PCB
* Update keyboards/mmkzoo65/rules.mk
* Update keyboards/mmkzoo65/rules.mk
2022-01-08 19:57:31 -08:00
a1ca14c1e1
Merge remote-tracking branch 'origin/master' into develop
2022-01-09 03:54:14 +00:00
50d81b63e9
[Keyboard] Stelo65 ( #15102 )
...
* [Keyboard] add new keyboard Stelo
* [Keyboard] Stelo encoder action
* Update keyboards/wekey/stelo/readme.md
* Update keyboards/wekey/stelo/rules.mk
* [Keyboard] change name Stelo to Stelo65
2022-01-08 19:53:45 -08:00
de59dd1835
Merge remote-tracking branch 'origin/master' into develop
2022-01-09 02:34:46 +00:00
69510bab8e
[Keyboard] add Haus PCB ( #12434 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-01-08 18:33:46 -08:00
e67ac61160
Merge remote-tracking branch 'origin/master' into develop
2022-01-09 02:30:48 +00:00
ac02260bcb
Updated Info.json for westm/westmergo ( #15530 )
...
* Added WestM keyboard
* Update keyboards/westm/westm68/config.h
* Update keyboards/westm/westm68/config.h
* Update keyboards/westm/westm68/rules.mk
* Update keyboards/westm/westm68/rules.mk
* Update keyboards/westm/westm68/rules.mk
* Updated Ergo as well to match Drashna's recommended changes
* Added layers for VIA and updated keymaps
* Applied missing changes that were done on 68 but not Ergo
* Update keyboards/westm/westmergo/readme.md
* Update keyboards/westm/westmergo/readme.md
* Update keyboards/westm/westm68/readme.md
* Update keyboards/westm/westm68/rules.mk
* Update keyboards/westm/westmergo/rules.mk
* Update keyboards/westm/westm68/rules.mk
* Update keyboards/westm/westmergo/rules.mk
* Update keyboards/westm/westm68/readme.md
* Updated README bootloader and keymaps
* Updated info.json
* Changed to proper layout (for real this time)
* Updated info.json
* Fixed Alice layout in info.json
2022-01-08 18:30:14 -08:00
a120a166b9
Merge remote-tracking branch 'origin/master' into develop
2022-01-09 01:30:24 +00:00
4c1fd0897c
[Keyboard] Add Hillside support ( #15399 )
...
* [Keyboard] Add Hillside
* Remove no longer used define, rename README
* Rename to readme.md
* Readme: Improve clarity, fix grammar and typos
* Readme: Remove extra line pointing to QMK docs
* Readme: Join consecutive source lines in .md
* Readme: split lines, post spelling fix
* Keymap: fix key label in readme
2022-01-08 17:29:51 -08:00
687d4772a7
Merge remote-tracking branch 'origin/master' into develop
2022-01-09 00:14:06 +00:00
fc8346e0b3
[keyboard] BumbleBee handwired ( #14908 )
...
* add bumblebee
* change keymaps
* change PID
* update info.json
* Apply suggestions from code review
* Update keyboards/handwired/swiftrax/bumblebee/rules.mk
* update readme.md
* Update keyboards/handwired/swiftrax/bumblebee/info.json
* edit keymaps
* Update keyboards/handwired/swiftrax/bumblebee/rules.mk
* Update keyboards/handwired/swiftrax/bumblebee/bumblebee.h
* Update keyboards/handwired/swiftrax/bumblebee/info.json
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
2022-01-08 16:13:37 -08:00
fea1a3d5c7
Merge remote-tracking branch 'origin/master' into develop
2022-01-09 00:13:07 +00:00
4b0aa1a2af
kbdfans/kbd67/mkiirgb_iso: LAYOUT_65_iso_blocker conformance ( #15794 )
2022-01-08 16:12:37 -08:00
6332caef78
Merge remote-tracking branch 'origin/master' into develop
2022-01-08 21:24:33 +00:00
a461f607e7
[Keyboard] Add Kudox Full ( #15256 )
...
* Add Kudox Full keyboard
* Add keyboards/kudox_full SPDX identifier
* Modify rule.mk of keyboards/kudox_full
* Remove html code from README of keyboards/kudox_full
* Modify readme of keyboards/kudox_full
* rev1.c includes rev1.h - kudox-full/rev1
* Move to <keyboard>.c oled_task_user and eeconfig_init_user
* Move post_config.h MOUSEKEY_*
* Change BOOTMAGIC_ENABLE no kudox_full
* Modify the obsoleted codes
* Modify eeconfig_init_kb from eeconfig_init_user
* Set none as default, but values
* Add about the bootloader on kudox_full/readme
* Modify the comments in keyboards/kudox_full/rules.mk
2022-01-08 13:23:34 -08:00
ff878aa30c
Merge remote-tracking branch 'origin/master' into develop
2022-01-08 21:23:13 +00:00
4c080be8e8
[Keyboard] Bathroom Epiphanies Frosty Flake rev 20130602 ( #15365 )
...
* add optional support for Frosty Flake rev 20130602
* update documentation with instructions on building for rev 20130602
* support revisions using subfolders instead of preprocessor directives
* rules.mk cleanup
2022-01-08 13:22:14 -08:00
98aaf7dccd
Merge remote-tracking branch 'origin/master' into develop
2022-01-08 21:19:44 +00:00
31331e6d33
[Keyboard] Glacier handwired ( #14758 )
...
* finish adding glacier
* change PID
* Update keyboards/handwired/swiftrax/glacier/info.json
* edit info.json
* Update keyboards/handwired/swiftrax/glacier/info.json
* Apply suggestions from code review
* Update keyboards/handwired/swiftrax/glacier/rules.mk
2022-01-08 13:19:13 -08:00
86fd95962c
Merge remote-tracking branch 'origin/master' into develop
2022-01-08 21:14:01 +00:00
604fca4aa9
[Keyboard] bstk100 handwired ( #14158 )
...
* General: Initial commit for bstk100
* bstk100 custom keyboard firmware
* fix Bootloader section
* fix "Pad 0" key twice
* delete via config
* fix readme.md key layout
* add via keymap
* fix readme.md info
* remove keymap.json
* Suggested change readme.md
* moved to handwired folder
* fix readme.md for handwired
* fix info.json
* Suggested change readme.md
* Update keyboards/handwired/bstk100/rules.mk
fix requested changes
* Update keyboards/handwired/bstk100/rules.mk
fix requested changes
* Update keyboards/handwired/bstk100/info.json
* Update keyboards/handwired/bstk100/rules.mk
2022-01-08 13:13:29 -08:00
3c9ddf7c53
Merge remote-tracking branch 'origin/master' into develop
2022-01-08 20:51:03 +00:00
rhmokey