qieq 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bb356a1584 
							
						 
					 
					
						
						
							
							[Docs] Update path to keycode.h ( #14263 )  
						
						
						
						
							
						
					 
					
						2021-09-01 20:40:12 -07:00 
						 
				 
			
				
					
						
							
							
								James Young 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7575bc23a6 
							
						 
					 
					
						
						
							
							MatchstickWorks SouthPad: correct Configurator key sequence ( #14255 )  
						
						... 
						
						
						
						* matchstickworks/southpad: correct Configurator key sequence
* replace tabs with spaces; apply four-space indent 
						
						
							
						
					 
					
						2021-09-01 10:44:03 -07:00 
						 
				 
			
				
					
						
							
							
								James Young 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							583f07ac58 
							
						 
					 
					
						
						
							
							owl8: add info.json file ( #14256 )  
						
						... 
						
						
						
						* owl8: add info.json file
* remove width and height keys (per fauxpark)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-09-01 13:20:56 +01:00 
						 
				 
			
				
					
						
							
							
								Jay Greco 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c573926e05 
							
						 
					 
					
						
						
							
							Fix snailmap compilation error ( #14250 )  
						
						... 
						
						
						
						* Fix snailmap compilation error
* Update keymap.c with correct OLED_ENABLE defines 
						
						
							
						
					 
					
						2021-09-01 10:48:14 +01:00 
						 
				 
			
				
					
						
							
							
								James Young 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8d97c54770 
							
						 
					 
					
						
						
							
							mnk50: Configurator Fix and Layout Macro Additions ( #14257 )  
						
						... 
						
						
						
						Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-09-01 12:50:32 +10:00 
						 
				 
			
				
					
						
							
							
								Casey Webster 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c5ec423438 
							
						 
					 
					
						
						
							
							[Keymap] cwebster2 Keymap and userspace updates ( #14258 )  
						
						
						
						
							
						
					 
					
						2021-08-31 17:50:42 -07:00 
						 
				 
			
				
					
						
							
							
								Andre Brait 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fac5ec4656 
							
						 
					 
					
						
						
							
							Move GMMK Pro layouts to the correct subdir ( #14241 )  
						
						... 
						
						
						
						Also fix a compilation issue in the mike1808 keymap 
						
						
							
						
					 
					
						2021-09-01 00:18:35 +01:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b7693c971c 
							
						 
					 
					
						
						
							
							[Keyboard] Disable console on Iris Rev5 ( #14249 )  
						
						
						
						
							
						
					 
					
						2021-08-31 15:25:46 -07:00 
						 
				 
			
				
					
						
							
							
								James Young 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							92106ee038 
							
						 
					 
					
						
						
							
							emi20: remove dead space from Configurator layout ( #14254 )  
						
						
						
						
							
						
					 
					
						2021-08-31 19:29:49 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Jen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b6d7b13a7a 
							
						 
					 
					
						
						
							
							[Keyboard] Add FJLabs KF87 PCB ( #14179 )  
						
						... 
						
						
						
						Co-authored-by: Drashna Jaelre <drashna@live.com> 
						
						
							
						
					 
					
						2021-08-31 11:24:41 -07:00 
						 
				 
			
				
					
						
							
							
								Ibnu Daru Aji 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6f5428687c 
							
						 
					 
					
						
						
							
							[Keymap] reflects current rick's keymap ( #14169 )  
						
						
						
						
							
						
					 
					
						2021-08-31 11:23:02 -07:00 
						 
				 
			
				
					
						
							
							
								Salicylic-acid3 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bdd0a6c097 
							
						 
					 
					
						
						
							
							[Keyboard] Addition of VIA keymap and a few fixes for naked60 ( #14225 )  
						
						... 
						
						
						
						Co-authored-by: Joel Challis <git@zvecr.com> 
						
						
							
						
					 
					
						2021-08-30 22:19:21 -07:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f2c9e82e5b 
							
						 
					 
					
						
						
							
							cherry pick tidy up ( #14244 )  
						
						
						
						
							
 
						
					 
					
						2021-08-31 00:25:41 +01:00 
						 
				 
			
				
					
						
							
							
								coliss86 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1e7117317f 
							
						 
					 
					
						
						
							
							Documentation: Fix links in key overrides ( #14228 )  
						
						... 
						
						
						
						Co-authored-by: Joel Challis <git@zvecr.com> 
						
						
							
						
					 
					
						2021-08-31 09:13:19 +10:00 
						 
				 
			
				
					
						
							
							
								JX 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5ed8edae49 
							
						 
					 
					
						
						
							
							Update ws2812_spi.c ( #14237 )  
						
						
						
						
							
 
						
					 
					
						2021-08-30 20:34:19 +01:00 
						 
				 
			
				
					
						
							
							
								Danny 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2dc07391bd 
							
						 
					 
					
						
						
							
							[Keyboard] Add Iris Rev. 5 ( #13934 )  
						
						... 
						
						
						
						Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-08-30 11:49:46 -07:00 
						 
				 
			
				
					
						
							
							
								dogspace 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							27aebba1b1 
							
						 
					 
					
						
						
							
							[Keymap] Add new snailmap keymap to nullbitsco/nibble keyboard ( #14024 )  
						
						... 
						
						
						
						Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-08-30 11:42:04 -07:00 
						 
				 
			
				
					
						
							
							
								kb-elmo 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c9283f4c1f 
							
						 
					 
					
						
						
							
							[Keyboard] Add OwLab Jelly Epoch ( #14190 )  
						
						... 
						
						
						
						Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-08-30 11:29:15 -07:00 
						 
				 
			
				
					
						
							
							
								Rifaa Subekti 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b63114ea29 
							
						 
					 
					
						
						
							
							[Keyboard] add slamz keyboard ( #14188 )  
						
						... 
						
						
						
						Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-08-30 11:28:54 -07:00 
						 
				 
			
				
					
						
							
							
								Purdea Andrei 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9583f9f589 
							
						 
					 
					
						
						
							
							[Bug] Fix build error when enabling NO_HAPTIC_MOD ( #14178 )  
						
						... 
						
						
						
						Without this build would fail, if a keyboard had haptic feedback enabled,
TAPPING_TOGGLE was not overridden in a config.h, and if NO_HAPTIC_MOD was
defined in config.h. 
						
						
							
 
						
					 
					
						2021-08-30 11:22:53 -07:00 
						 
				 
			
				
					
						
							
							
								Felix Jen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							949cfd4632 
							
						 
					 
					
						
						
							
							[Keyboard] add maker keyboards alexa ( #14165 )  
						
						
						
						
							
						
					 
					
						2021-08-30 11:05:13 -07:00 
						 
				 
			
				
					
						
							
							
								peott-fr 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							557fce7a8e 
							
						 
					 
					
						
						
							
							[Keymap] Add peott-fr keymap for Kbd6x ( #14164 )  
						
						
						
						
							
						
					 
					
						2021-08-30 11:04:42 -07:00 
						 
				 
			
				
					
						
							
							
								Vincent Vorholter 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9d32cb68c3 
							
						 
					 
					
						
						
							
							[Keyboard] Changed ProductID on basketweav keyboards ( #14162 )  
						
						... 
						
						
						
						Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Vince Vorholter <vince@28east.co.za> 
						
						
							
						
					 
					
						2021-08-30 11:03:53 -07:00 
						 
				 
			
				
					
						
							
							
								Zach White 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							baa423004a 
							
						 
					 
					
						
						
							
							ensure that the directory for sys.executable is in the user's path ( #14229 )  
						
						
						
						
							
						
					 
					
						2021-08-29 16:46:36 -07:00 
						 
				 
			
				
					
						
							
							
								Zach White 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b705020daf 
							
						 
					 
					
						
						
							
							move everything from qmkfm/base_container to qmkfm/qmk_cli ( #14230 )  
						
						
						
						
							
 
						
					 
					
						2021-08-29 16:41:56 -07:00 
						 
				 
			
				
					
						
							
							
								peott-fr 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							13a2da973f 
							
						 
					 
					
						
						
							
							Nyquist ( #14202 )  
						
						... 
						
						
						
						* adding my Nyquist keymap
* Updating Nyquist keymap with licensing.
* Cleaning-up and improving Nyquist keymap.
* Cleaning-up and improving Nyquist keymap. 
						
						
							
						
					 
					
						2021-08-29 22:52:49 +01:00 
						 
				 
			
				
					
						
							
							
								Sergey Vlasov 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a1866a962c 
							
						 
					 
					
						
						
							
							Update the nix-shell environment ( #13316 )  
						
						... 
						
						
						
						* Nix: Allow calls to `bin/qmk` even when the build was started by `qmk`
The `$PATH` modifications performed by the Nix wrapper for the `qmk`
executable prevent `bin/qmk` from working properly (the changed `$PATH`
contains a wrong `python3` executable which does not have the needed
Python modules in its module path).  As a workaround, disable the
generation of that wrapper for the `qmk` Python package (there is yet
another wrapper generated while building the Python environment, which
would still set the Python module path properly when running `qmk`).
Although `bin/qmk` is officially deprecated, QMK CLI still invokes it in
some cases (at least `qmk doctor` and `qmk pytest`), therefore keeping
these invocations working is useful.
* Nix: Update `util/nix/pyproject.toml` to match `requirements*.txt`
Update the Python dependency information used by Poetry to match the
current state of the qmk_firmware code.
* Nix: Bump QMK CLI dependency to 1.0.0; bump other Python deps
Update Python dependencies for nix-shell to the most recent releases:
 - dotty-dict: 1.3.0 -> no longer used
 - milc: 1.4.2 -> 1.6.2
 - pep8-naming: 0.11.1 -> 0.12.1
 - pygments: 2.9.0 -> 2.10.0
 - pyrsistent: 0.17.3 -> 0.18.0
 - pyusb: 1.1.1 -> 1.2.1
 - setuptools-scm: 6.0.1 -> no longer used
 - qmk: 0.1.0 -> 1.0.0
 - qmk-dotty-dict: not used -> 1.3.0.post1
 - yapf: 0.30.0 -> 0.31.0
Note to self: The command to update Python dependencies changed to:
    ( cd util/nix && nix run 'nixpkgs#poetry' -- update --lock ) 
						
						
							
 
						
					 
					
						2021-08-29 22:24:43 +01:00 
						 
				 
			
				
					
						
							
							
								J.Flanagan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ef7fdee6c8 
							
						 
					 
					
						
						
							
							[Keyboard] Add Viktus SP Mini ( #14069 )  
						
						... 
						
						
						
						Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com> 
						
						
							
						
					 
					
						2021-08-29 12:18:56 -07:00 
						 
				 
			
				
					
						
							
							
								Trent Hoh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f87cd8e8a0 
							
						 
					 
					
						
						
							
							[Keyboard] Corrected layout for np24 by YMDK ( #14096 )  
						
						... 
						
						
						
						Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-08-29 04:09:43 -07:00 
						 
				 
			
				
					
						
							
							
								peott-fr 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							94d7635a4a 
							
						 
					 
					
						
						
							
							[Keymap] My Prime E keymap ( #14117 )  
						
						
						
						
							
						
					 
					
						2021-08-29 04:08:23 -07:00 
						 
				 
			
				
					
						
							
							
								Weirdo 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5d5668c3f8 
							
						 
					 
					
						
						
							
							[Keyboard] Add kelownaRGB64 ( #14141 )  
						
						... 
						
						
						
						Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-08-29 04:07:54 -07:00 
						 
				 
			
				
					
						
							
							
								Takeshi ISHII 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9afc64cd61 
							
						 
					 
					
						
						
							
							[Keyboard] fix compile error make helix/rev2/sc:all ( #14214 )  
						
						
						
						
							
						
					 
					
						2021-08-29 15:06:00 +09:00 
						 
				 
			
				
					
						
							
							
								Nick Brassel 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dd8922d482 
							
						 
					 
					
						
						
							
							Fixup upstream paths for submodules. ( #14205 )  
						
						
						
						
							
 
						
					 
					
						2021-08-29 10:51:53 +10:00 
						 
				 
			
				
					
						
							
							
								Nick Brassel 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6caebb7b61 
							
						 
					 
					
						
						
							
							Bootmagic lite docs clarity. ( #14204 )  
						
						
						
						
							
						
					 
					
						2021-08-29 09:47:48 +10:00 
						 
				 
			
				
					
						
							
							
								Nick Brassel 
							
						 
					 
					
						
						
						
						
							
						
						
							f061ca4974 
							
						 
					 
					
						
						
							
							Breaking changes develop merge to master, 2021Q3 edition. ( #14196 )  
						
						
						
						
							
 
 
						
					 
					
						2021-08-29 08:20:25 +10:00 
						 
				 
			
				
					
						
							
							
								Nick Brassel 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4bad375d7c 
							
						 
					 
					
						
						
							
							2021Q3 pre-merge develop changelog, keyboard aliases ( #14198 )  
						
						... 
						
						
						
						* Initial changelog.
* Data driven.
* Submodule update.
* Updated breaking changes docs.
* Aliases.
* Aliases. 
						
						
							
						
					 
					
						2021-08-29 08:18:18 +10:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							29ec2d8f42 
							
						 
					 
					
						
						
							
							[Docs] Add examples to RGB Matrix Indicators docs ( #12797 )  
						
						
						
						
							
						
					 
					
						2021-08-27 06:41:33 +10:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							7e1634e2a6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2021-08-26 17:50:09 +00:00 
						 
				 
			
				
					
						
							
							
								jackytrabbit 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ff65185dec 
							
						 
					 
					
						
						
							
							Add support for lazydesigners/cassette8 ( #14145 )  
						
						... 
						
						
						
						* Add support for lazydesigners/cassette8
Add support for lazydesigners/cassette8
* Update keyboards/lazydesigners/cassette8/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/lazydesigners/cassette8/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/lazydesigners/cassette8/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/lazydesigners/cassette8/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/lazydesigners/cassette8/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/lazydesigners/cassette8/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/lazydesigners/cassette8/info.json
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com> 
						
						
							
						
					 
					
						2021-08-26 18:49:36 +01:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							a13b0d8a6c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2021-08-26 17:47:28 +00:00 
						 
				 
			
				
					
						
							
							
								jpuerto96 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3fce5e6912 
							
						 
					 
					
						
						
							
							New Keyboard - V4n4g0rth0n ( #14152 )  
						
						... 
						
						
						
						* General: Initial commit for v4n4g0rth0n
* Remove unecessary things|
* General: Fix info.json
* Finalize changes
* Update keyboards/v4n4g0rth0n/config.h
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/v4n4g0rth0n/v1/rules.mk
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/v4n4g0rth0n/v4n4g0rth0n.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/v4n4g0rth0n/v4n4g0rth0n.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/v4n4g0rth0n/v2/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/v4n4g0rth0n/v1/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2021-08-26 18:45:48 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							87cdb1cf9a 
							
						 
					 
					
						
						
							
							Update readme files ( #14172 )  
						
						
						
						
							
						
					 
					
						2021-08-26 16:53:24 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							48d0ad28e7 
							
						 
					 
					
						
						
							
							Move to correct location ( #14171 )  
						
						
						
						
							
						
					 
					
						2021-08-26 14:14:48 +01:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							6d646880a4 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2021-08-26 11:38:28 +00:00 
						 
				 
			
				
					
						
							
							
								kb-elmo 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							edf35615cf 
							
						 
					 
					
						
						
							
							Skeletn87 - Fix RGB pin ( #14170 )  
						
						... 
						
						
						
						* add Skeletn87
* update skeletn87 files
* update skeletn87 soldered
* update readme image
* update readme (again)
* fix skeletn87 indicator LEDs
* fix led pin for production PCB 
						
						
							
						
					 
					
						2021-08-26 12:37:55 +01:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							2bc978437e 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2021-08-25 23:56:39 +00:00 
						 
				 
			
				
					
						
							
							
								Charles 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ee3a1133f1 
							
						 
					 
					
						
						
							
							[keyboard] Add 0x3E ( #14088 )  
						
						... 
						
						
						
						* Add 0x3E - default config
* Apply suggestions from code review
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Apply suggestions from code review 2
Firmware size optimization
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Rename files as per project guidelines + remove empty
* Update link in readme.md
Co-authored-by: Drashna Jaelre <drashna@live.com> 
						
						
							
						
					 
					
						2021-08-26 00:56:09 +01:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							0c97bc5179 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2021-08-25 23:40:04 +00:00 
						 
				 
			
				
					
						
							
							
								8bits4ever 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4c5334cb9e 
							
						 
					 
					
						
						
							
							[converter/a1200] Changing layout macro reference info.json ( #14143 )  
						
						... 
						
						
						
						* Rename keyboards/converter/a1200/config.h to keyboards/converter/a1200/teensy2pp/config.h
* Rename keyboards/converter/a1200/rules.mk to keyboards/converter/a1200/teensy2pp/rules.mk
* Create dummy
* Add files via upload
* Delete dummy
* Update readme.md
* Update info.json 
						
						
							
						
					 
					
						2021-08-26 00:39:34 +01:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							329c130202 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
							
						
					 
					
						2021-08-25 19:04:06 +00:00