QMK Bot
bf3a88ab57
Merge remote-tracking branch 'origin/master' into develop
2023-11-16 17:49:12 +00:00
フィルターペーパー
a6521b8521
[Doc] Improve converter references ( #21801 )
2023-11-16 17:48:24 +00:00
QMK Bot
970e0b18a2
Merge remote-tracking branch 'origin/master' into develop
2023-11-13 20:56:16 +00:00
precondition
50844a8e67
Fix typos: key-modifer→key-modifier and interacton→interaction ( #22464 )
2023-11-13 20:55:45 +00:00
Joel Challis
e884e42ce9
Generalise ADC driver source inclusion ( #22448 )
2023-11-12 22:30:27 +00:00
Ryan
786ebf8760
Remove requirement for keymap_steno.h
include in keymaps ( #22423 )
...
* Remove requirement for `keymap_steno.h` include in keymaps
* Add back keymap_steno.h with a note for the time being
2023-11-12 18:25:46 +11:00
Joel Challis
84df69572c
Infer LED DRIVER_COUNT from configured addresses ( #22311 )
2023-11-10 05:14:22 +00:00
Joel Challis
147865cf57
Migrate some common features to generic ( #22403 )
2023-11-09 02:01:44 +00:00
QMK Bot
c9afacccf4
Merge remote-tracking branch 'origin/master' into develop
2023-11-03 23:14:49 +00:00
Kiryl Mialeshka
ace510ffa0
docs(rgblight): fix typos ( #22399 )
2023-11-03 23:14:18 +00:00
Joel Challis
fbbb221a31
Implement data driven lighting defaults ( #21825 )
2023-11-01 01:26:24 +00:00
Joel Challis
a19ae3d784
Add dd mapping for hardware based split handedness ( #22369 )
2023-11-01 00:55:48 +00:00
Joel Challis
98530cad3b
Implement data driven dip switches ( #22017 )
...
* Add data driven dip switches
* Autogen weak matrix_mask
2023-10-29 01:09:02 +01:00
Dasky
c5716f84ad
Merge branch 'master' into develop
2023-10-26 22:44:14 +01:00
Dasky
e0c00c35ce
Clarify PIO define is optional in docs. ( #22339 )
2023-10-26 22:34:17 +01:00
jack
896d3dc497
Add DD mappings for locking switch ( #22242 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-10-25 02:15:27 -07:00
Joel Challis
bf6f13a2b0
Consolidate some EEPROM Driver configuration ( #22321 )
2023-10-23 00:37:27 +01:00
Nick Brassel
8e614250b4
[QP] Add support for OLED, variable framebuffer bpp ( #19997 )
...
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Fixup delta frame coordinates after #20296 .
2023-10-22 13:27:31 +11:00
Ryan
d56ee70c52
Rename DRIVER_ADDR_n
defines ( #22200 )
...
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-10-21 21:41:59 +10:00
Joel Challis
e4c54a9612
Support additional split sync items for info.json ( #22193 )
2023-10-21 01:48:05 +01:00
Ryan
c157c19b81
Dedupe I2C, SPI, UART driver inclusions ( #22253 )
2023-10-13 17:25:32 +11:00
QMK Bot
f4ed65169f
Merge remote-tracking branch 'origin/master' into develop
2023-10-12 19:47:06 +00:00
Wilhelm Schuster
b630df1aa7
Reword mention of personal keymaps from PR checklist ( #22258 )
2023-10-13 06:46:28 +11:00
QMK Bot
0e5f7ac3ba
Merge remote-tracking branch 'origin/master' into develop
2023-10-09 22:17:19 +00:00
Joel Challis
509a2b40b7
Fix old usage of UNICODE_MODE_MAC ( #22238 )
2023-10-09 23:16:54 +01:00
QMK Bot
e2e6b3dfd6
Merge remote-tracking branch 'origin/master' into develop
2023-10-09 08:38:22 +00:00
James Young
6e6fff866e
Fix typo in docs/feature_tri_layer.md
( #22232 )
...
`Stes` -> `Sets`
2023-10-09 09:37:21 +01:00
Ryan
d99dbe4d56
Update ISSI LED types ( #22099 )
2023-10-04 20:12:50 +11:00
Ryan
c0f16be50f
Rename CKLED2001 driver to SNLED27351 ( #22071 )
2023-10-04 20:10:05 +11:00
QMK Bot
733f1da96b
Merge remote-tracking branch 'origin/master' into develop
2023-10-04 00:19:44 +00:00
Joel Challis
a638f6e5aa
Fix minimum python version references ( #22191 )
2023-10-04 01:19:04 +01:00
Ryan
bd5860de4e
is31fl3737/3741: add LED Matrix support ( #22163 )
2023-10-03 01:09:20 +11:00
QMK Bot
da5d745c73
Merge remote-tracking branch 'origin/master' into develop
2023-10-01 05:34:31 +00:00
フィルターペーパー
8813bdf5dd
Remove rosetta instructions for Apple Silicon ( #22174 )
2023-09-30 22:33:57 -07:00
Joel Challis
6910ed2de5
Add _DEFAULT_ON lighting configuration options ( #21865 )
2023-09-29 18:31:21 +01:00
Álvaro A. Volpato
2eed1f5bad
Add RGBLIGHT_DEFAULT_ON
macro configuration option ( #20857 )
...
* ADD RGB_DEFAULT_DISABLED option and updated documentation
* Formatting
* Add as by fauxpark's suggestion
Co-authored by: fauxpark
* Formatting
* Use boolean values instead of numerical
Co-authored-by: Ryan <fauxpark@gmail.com>
* Edit documentation formatting
Co-authored-by: Ryan <fauxpark@gmail.com>
* Remove comment
Co-authored-by: Ryan <fauxpark@gmail.com>
* Set RGB mode to DEFAULT macro at init
Co-authored-by: Ryan <fauxpark@gmail.com>
---------
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: zvecr <git@zvecr.com>
2023-09-29 14:53:12 +01:00
Ryan
d58f85e09e
is31fl3733: complete LED Matrix support ( #22149 )
2023-09-27 16:11:28 +10:00
Ryan
288c2313fe
is31fl3218: Add LED Matrix support ( #22126 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2023-09-27 14:37:06 +10:00
Ryan
32de27bb20
is31fl3736: extract single-color API ( #22133 )
2023-09-27 01:18:07 +01:00
Joel Challis
80ccbdfd86
More data driven RGB/LED Matrix config ( #21939 )
2023-09-27 00:41:13 +01:00
QMK Bot
be1214814e
Merge remote-tracking branch 'origin/master' into develop
2023-09-26 06:17:57 +00:00
Yanfei Guo
17ae28f0e4
Fix doc for programmable buttons. ( #22136 )
...
Co-authored-by: Yanfei Guo <yguo@anl.gov>
2023-09-25 23:17:20 -07:00
QMK Bot
0b6c9385bc
Merge remote-tracking branch 'origin/master' into develop
2023-09-25 19:41:01 +00:00
Ikko Eltociear Ashimine
6eb2e43a8d
Fix typo in oled_driver ( #22134 )
...
betwen -> between
2023-09-25 20:40:27 +01:00
Joel Challis
339bff6339
Move velocikey to within rgblight ( #22123 )
2023-09-25 17:48:10 +01:00
Ryan
a931e6d7bd
Update WS2812 docs and add APA102 docs ( #22106 )
...
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-09-25 14:18:40 +10:00
Ryan
21ed9b4575
Simplify more feature driver defines ( #22090 )
2023-09-25 13:06:42 +10:00
Nick Brassel
c597731d1d
Merge remote-tracking branch 'upstream/master' into develop
2023-09-25 13:03:02 +10:00
Michael Büchler
4d994458f0
Document the RP2040-specific PS/2 implementation ( #22079 )
...
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
2023-09-25 13:00:13 +10:00
HorrorTroll
9d526b8d66
Added flower blooming on RGB Matrix effect ( #21948 )
2023-09-25 12:58:45 +10:00
Purdea Andrei
408d61dcfb
Chibios SPI driver: allow some SPI pins to be left unassigned ( #20315 )
...
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-09-25 12:54:22 +10:00
Isaac Elenbaas
dd94877ec6
Improve test invocation, fix Retro Shift bugs, and add Auto+Retro Shift test cases ( #15889 )
2023-09-25 12:45:49 +10:00
Pablo Martínez
a360900fbb
[Enhancement] QP Getters ( #21171 )
2023-09-25 12:31:46 +10:00
jacob-w-gable
99290b4c7e
Add full solenoid support on split keyboards ( #21583 )
...
Co-authored-by: Jacob Gable <jacob.gable@statheros.tech>
2023-09-25 12:23:31 +10:00
QMK Bot
7a761ebf7d
Merge remote-tracking branch 'origin/master' into develop
2023-09-25 01:51:10 +00:00
Nick Brassel
9b429bd12d
Revert "Update feature_rgblight.md" ( #22132 )
2023-09-25 11:50:35 +10:00
QMK Bot
2821561618
Merge remote-tracking branch 'origin/master' into develop
2023-09-25 01:44:31 +00:00
Tom singleton
ee4e22d5ea
Update feature_rgblight.md ( #21483 )
2023-09-25 11:43:55 +10:00
QMK Bot
81ea182be4
Merge remote-tracking branch 'origin/master' into develop
2023-09-23 08:18:44 +00:00
lendunistus
bd2a33fe77
Add reminder about format-json to PR Checklist ( #22055 )
2023-09-23 01:18:11 -07:00
QMK Bot
d5baa925e7
Merge remote-tracking branch 'origin/master' into develop
2023-09-23 02:19:10 +00:00
Ryan Neff
d49edbcf14
Added OLED SSD1306 128x64 to the verified working table ( #22112 )
2023-09-23 12:18:37 +10:00
Ryan
4b26d9b62b
Update AW20216S LED type ( #22072 )
...
* Update AW20216S LED type
* Remove mattgauf keymap
2023-09-20 11:50:52 +01:00
Ryan
8f22105289
Add and use I2C address defines for ISSI LED drivers ( #22008 )
2023-09-19 19:31:54 +10:00
Ryan
1ea54a2d8d
Complete RGB Matrix support for IS31FL3218 ( #22004 )
2023-09-17 22:11:16 +10:00
QMK Bot
32126dc4f0
Merge remote-tracking branch 'origin/master' into develop
2023-09-17 07:12:06 +00:00
Joel Challis
39fafdac0f
Move Digitizer to "Software Features" ( #22031 )
2023-09-17 08:11:32 +01:00
David Hoelscher
169b0f33f6
Lvgl rate control ( #22049 )
2023-09-17 14:25:14 +10:00
Chris Salch
d8e100ae3c
Allow force flush of oled display ( #20953 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-09-14 01:20:03 -07:00
Joel Challis
1b637287a1
Default wear leveling logical size to half backing ( #22006 )
2023-09-14 07:13:21 +10:00
Ryan
8136eda6d4
is31fl3731: driver naming cleanups ( #21918 )
2023-09-13 22:53:15 +10:00
Ryan
1cbb5ae99e
is31fl3733: driver naming cleanups ( #21905 )
2023-09-13 22:52:16 +10:00
Ryan
2d41443e6a
is31fl3736: driver naming cleanups ( #21903 )
2023-09-13 22:50:20 +10:00
Ryan
d36f73a431
is31fl3737: driver naming cleanups ( #21904 )
2023-09-13 22:49:29 +10:00
Ryan
a0aebe5cd5
aw20216: driver naming cleanups ( #21891 )
2023-09-13 22:45:17 +10:00
QMK Bot
5633a2cdb4
Merge remote-tracking branch 'origin/master' into develop
2023-09-06 02:00:58 +00:00
3geek14
e3c6467ab9
[Docs] Improve contrast for warnings in dark mode ( #21928 )
2023-09-05 19:00:14 -07:00
Joel Challis
5fab310e65
Implement data driven wear leveling ( #21906 )
...
* DD encoder map, wear leveling
* remove encoder map from DD
let's avoid the support headache
* wear leveling: specify the allowed drivers by name
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add additional params
* Relocate under eeprom
* disable parsing
---------
Co-authored-by: Dimitris Mantzouranis <d3xter93@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-09-05 01:53:05 +01:00
Ryan
41bd4e35a0
Clean up RGB LED type ( #21859 )
2023-09-04 01:19:59 +01:00
Daniel Schaefer
dd887eae36
[Core] Allow customizing PWM frequency ( #21717 )
...
* [Core] Allow customizing PWM frequency
Some frequencies can cause audible noise. Changing the frequency
eliminates that.
Signed-off-by: Daniel Schaefer <dhs@frame.work>
* docs/feature-backlight: Mention PWM frequency
Signed-off-by: Daniel Schaefer <dhs@frame.work>
---------
Signed-off-by: Daniel Schaefer <dhs@frame.work>
2023-09-03 14:56:02 +02:00
Nick Brassel
4818e14c77
Breaking changes changelog, 2023q3 version ( #21848 )
...
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: honorless <86894501+lesshonor@users.noreply.github.com>
2023-08-29 21:15:21 +10:00
Ryan
70e34e491c
Unicode, Unicodemap and UCIS refactor ( #21659 )
2023-08-27 13:30:19 +10:00
Ryan
736451558e
Rework info.json reference ( #21324 )
...
* Rework info.json reference
* Apply suggestions from code review
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Update backlight.pins description
* Add rgblight.driver and lowercase other driver names
* Remove `split.main` and `split.matrix_grid` for now as they are not working yet
---------
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2023-08-26 21:03:29 +01:00
QMK Bot
50151be430
Merge remote-tracking branch 'origin/master' into develop
2023-08-26 18:44:20 +00:00
Andy Smith
f07490bc09
Corrected duration example, should be number not string ( #21839 )
2023-08-26 19:43:40 +01:00
QMK Bot
8e0173beef
Merge remote-tracking branch 'origin/master' into develop
2023-08-23 04:53:27 +00:00
フィルターペーパー
c2b837514b
[Doc] Improve magic keycode section ( #21787 )
2023-08-22 21:52:52 -07:00
Ryan
37bc949945
RGB Matrix: driver naming cleanups ( #21594 )
2023-08-23 01:00:03 +01:00
Joel Challis
dfb6d38f08
Simplfy RGB/LED matrix effect logic ( #21703 )
2023-08-23 00:03:01 +01:00
Ryan
1c069b13b9
rgblight: driver selection cleanups ( #21558 )
2023-08-15 11:06:57 +01:00
Ryan
5d2f2af198
OLED: driver naming cleanups ( #21710 )
2023-08-15 10:30:34 +01:00
QMK Bot
bbe58ddb21
Merge remote-tracking branch 'origin/master' into develop
2023-08-05 00:16:49 +00:00
Ryan
049a4baec0
Contributing docs: add note to make sure repo is up to date ( #21694 )
2023-08-05 10:16:10 +10:00
Ryan
0b802defd4
haptic: further naming cleanups ( #21682 )
2023-08-04 01:16:16 +01:00
QMK Bot
f1f0e6a7b3
Merge remote-tracking branch 'origin/master' into develop
2023-08-03 08:03:16 +00:00
3geek14
aa8d1c5e07
Clarify custom keycode enum requirement for PRs ( #21648 )
2023-08-03 01:02:40 -07:00
QMK Bot
fa4d51dab7
Merge remote-tracking branch 'origin/master' into develop
2023-07-30 04:23:13 +00:00
3geek14
14e14e9ab8
Correct "less than" to "up to" in squeezing_avr?id=layers ( #21639 )
2023-07-30 14:22:39 +10:00
Ryan
571b8bac82
LED Matrix: driver naming cleanups ( #21580 )
2023-07-29 15:25:00 +10:00
Ryan
b4a7b9253a
Bluetooth: driver naming cleanups ( #21624 )
2023-07-29 15:16:14 +10:00
QMK Bot
f3a7cd5573
Merge remote-tracking branch 'origin/master' into develop
2023-07-27 04:21:43 +00:00
Duncan Sutherland
ce11427b11
Amend documented RGBLIGHT_HUE_STEP
default value ( #21617 )
2023-07-26 21:21:11 -07:00
leep-frog
2c70d38910
On-each-release tap dance function ( #20255 )
...
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2023-07-26 21:04:35 -07:00
Ryan
8b7ac7f2ca
Raw HID: documentation improvements ( #21596 )
2023-07-25 09:20:41 +10:00
QMK Bot
321c18acec
Merge remote-tracking branch 'origin/master' into develop
2023-07-23 08:07:50 +00:00
peepeetee
1ca34c2168
Fix VS code live share extension link ( #21585 )
2023-07-23 09:07:17 +01:00
Ryan
4137685f8e
backlight: split AVR PWM and timer drivers ( #21540 )
2023-07-21 09:27:55 +10:00
Ryan
b090354143
haptic: naming cleanups ( #21551 )
2023-07-21 09:17:39 +10:00
QMK Bot
657bddb5c3
Merge remote-tracking branch 'origin/master' into develop
2023-07-20 20:00:50 +00:00
フィルターペーパー
d47c4630f8
Document the right location for indicator functions ( #21512 )
2023-07-20 16:00:15 -04:00
フィルターペーパー
a05e5b5554
Add MOUSEKEY_WHEEL_DELTA documentation ( #21493 )
2023-07-10 10:57:08 -07:00
QMK Bot
de5f6539f8
Merge remote-tracking branch 'origin/master' into develop
2023-07-09 10:07:34 +00:00
フィルターペーパー
06a36824ad
[Docs] Squeeze AVR with simplified magic config functions ( #21477 )
2023-07-09 20:05:45 +10:00
Less/Rikki
a0ea7a6b17
feat, docs: WB32 flashing ( #21217 )
2023-07-08 00:48:45 +10:00
フィルターペーパー
df5984022f
Refactor kinetic mouse key feature ( #21164 )
2023-07-08 00:26:06 +10:00
precondition
1abf8f3e8b
[Feature] Send a dummy keycode to neutralize flashing modifiers in retro tap and key overrides ( #20992 )
2023-07-08 00:18:02 +10:00
Pablo Martínez
55295ed3dc
[Enhancement] More info on apply_autocorrect
( #21056 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-07-08 00:13:15 +10:00
QMK Bot
237c0a5840
Merge remote-tracking branch 'origin/master' into develop
2023-07-07 12:07:45 +00:00
Tom Barnes
3142f2dfdf
clarify what the heck pristine means for reasons ( #20950 )
2023-07-07 22:07:02 +10:00
Chris Salch
e9ff66d8ad
Adds a way to separate tab from AUTO_SHIFT_SPECIAL. ( #20996 )
2023-07-07 21:52:24 +10:00
QMK Bot
8be19519f2
Merge remote-tracking branch 'origin/master' into develop
2023-07-03 16:01:53 +00:00
Tim Stewart
b9c4bd0d66
Changed interverts to inverts ( #21270 )
...
* Changed interverts to inverts
* fixed spacing issue
Co-authored-by: Joel Challis <git@zvecr.com>
---------
Co-authored-by: Joel Challis <git@zvecr.com>
2023-07-03 17:01:10 +01:00
QMK Bot
9c7f176d4c
Merge remote-tracking branch 'origin/master' into develop
2023-07-03 07:09:21 +00:00
Pablo Martínez
26227d1f66
[Docs] Fix listed defaults in quantum painter docs ( #21429 )
2023-07-03 00:08:45 -07:00
Nick Brassel
c814be0296
STM32H723 support ( #21352 )
2023-06-28 13:07:14 +10:00
Ryan
12edfc0c69
Fix anchor IDs for some API references ( #21345 )
2023-06-24 17:44:50 +10:00
Joel Challis
3156cf6da0
Remove use of __flash within LED drivers ( #21343 )
2023-06-23 22:50:31 +01:00
QMK Bot
63735431d3
Merge remote-tracking branch 'origin/master' into develop
2023-06-21 02:58:50 +00:00
Albert Y
2f1cac6e9f
[Docs] Code markdown amendment ( #21323 )
2023-06-20 20:58:13 -06:00
Nick Brassel
ffdc70bf0a
Consolidate KEYBOARD_OUTPUT
+KEYMAP_OUTPUT
=>INTERMEDIATE_OUTPUT
( #21272 )
2023-06-21 08:41:49 +10:00
QMK Bot
808228c1a8
Merge remote-tracking branch 'origin/master' into develop
2023-06-20 01:56:07 +00:00
Drashna Jaelre
7bd1d18427
[Docs] Add note about ENABLE_COMPILE_KEYCODE
to docs ( #21290 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-06-19 19:55:27 -06:00
Ryan
9551a0a38a
Move RGBLIGHT_LED_MAP
to data driven ( #21095 )
2023-06-14 22:01:13 +10:00
QMK Bot
c69bc9d140
Merge remote-tracking branch 'origin/master' into develop
2023-06-10 14:57:25 +00:00
Tom Barnes
f35cb924e9
Update newbs docs with some rp2040 stuff ( #21186 )
...
* Update newbs_building_firmware_configurator.md
* Update docs/newbs_flashing.md
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-06-10 15:56:43 +01:00
QMK Bot
c871f6ad45
Merge remote-tracking branch 'origin/master' into develop
2023-06-09 14:51:59 +00:00
Pablo Martínez
04b7a262e0
Fix typo ( #21189 )
2023-06-09 15:51:17 +01:00
QMK Bot
f861695e83
Merge remote-tracking branch 'origin/master' into develop
2023-06-08 09:11:17 +00:00
Albert Y
4c6c387724
Add an emphasis on QMK MSYS terminal ( #21168 )
...
* Add an emphasis on QMK MSYS terminal
Not using MSYS terminal is a frequent user error. This change
adds an additional statement to guide users to run the first
command in MSYS itself. Edited the same statement for consistency
in the other OSes.
* Update instructions for the other operating systems
2023-06-08 10:10:30 +01:00
QMK Bot
b0c483bb87
Merge remote-tracking branch 'origin/master' into develop
2023-06-06 05:18:16 +00:00
Albert Y
43ce7b0df5
[Docs] Highlight keymap name entry ( #21138 )
2023-06-05 23:17:39 -06:00
Ryan
a4ed6ad0f5
Unicodemap keycodes rename ( #21092 )
2023-06-01 17:25:08 +01:00
QMK Bot
ffeaf462e3
Merge remote-tracking branch 'origin/master' into develop
2023-05-30 01:08:54 +00:00
precondition
1e2deddd43
Remove outdated remarks regarding the default MT behavior ( #21077 )
2023-05-30 02:08:15 +01:00
QMK Bot
11bba43953
Merge remote-tracking branch 'origin/master' into develop
2023-05-28 20:37:30 +00:00
Joel Challis
d02ff2edd9
Update "Most Recent ChangeLog" ( #21071 )
2023-05-28 21:36:46 +01:00
Nick Brassel
f2808dcbef
Branch point for 2023q3 Breaking Change.
2023-05-29 06:20:09 +10:00
Nick Brassel
32d865572c
develop
2023q2 changelog (#21049 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-05-29 06:02:11 +10:00
nuess0r
f98f8eedf0
Consolidate modelm v2 ( #14996 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-05-27 23:12:36 +10:00
QMK Bot
36b08d5d69
Merge remote-tracking branch 'origin/master' into develop
2023-05-21 16:44:51 +00:00