QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								536511a32a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-22 14:58:18 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mechlovin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8de0427fec 
								
							 
						 
						
							
							
								
								[Kay60] Change LED pin state and correct keycode. ( #17746 )  
							
							 
							
							
							
						 
						
							2022-07-22 15:57:03 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								0e81d63b64 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-22 13:23:36 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aidan Gauland 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								de10784799 
								
							 
						 
						
							
							
								
								Fix compilation error in Ploopy Nano maddie keymap ( #17733 )  
							
							 
							
							
							
						 
						
							2022-07-22 14:22:56 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								f1671ec720 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-22 03:43:08 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sắn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b9c7d4c48d 
								
							 
						 
						
							
							
								
								[Keyboard] Add Krush65 Hotswap ( #16692 )  
							
							 
							
							... 
							
							
							
							* Add Krush65 Hotswap
* Led fix
* small fix
* a
* B
* move ec action to VIA keymaps
* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md
* Update keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk
* Update readme.md
* Update readme.md
* Update readme.md
* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md
* Update keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk
* Update keyboards/sawnsprojects/krush/krush65/hotswap/info.json
* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md
* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md
* Update keyboards/sawnsprojects/krush/krush65/hotswap/info.json
* Update keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h 
							
						 
						
							2022-07-21 20:42:29 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								d681eac0ad 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-21 20:24:51 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joel Challis 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a0e47db5e 
								
							 
						 
						
							
							
								
								Add reviewer/labels to dependabot PRs ( #17743 )  
							
							 
							
							
							
						 
						
							2022-07-21 21:24:07 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								bfed88dba2 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-21 19:55:00 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4ca99af8f5 
								
							 
						 
						
							
							
								
								Bump JamesIves/github-pages-deploy-action from 4.3.4 to 4.4.0 ( #17742 )  
							
							 
							
							
							
						 
						
							2022-07-21 20:54:27 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5f32690cba 
								
							 
						 
						
							
							
								
								Move Pointing Device Initialization ( #17740 )  
							
							 
							
							... 
							
							
							
							Move Pointing Device Initialization to after Split Post Initialization
If both pointing device and split is enabled, the pointing device init needs to be called after the split post init, otherwise the connection (serial/etc) isn't initialized yet, and any commands that need to send data over (such as calling the set cpi command) never get sent over. 
							
						 
						
							2022-07-21 10:16:44 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									jpe230 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5c90732622 
								
							 
						 
						
							
							
								
								Adafruit Macropad: Add VIA keymap, fix default km ( #17735 )  
							
							 
							
							
							
						 
						
							2022-07-21 14:44:12 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								6081a8091d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-21 12:45:28 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									jonavin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7f0581cd35 
								
							 
						 
						
							
							
								
								Jonavin mercutio - reduce mem footprint  ( #17498 )  
							
							 
							
							... 
							
							
							
							* Reduce mem footprint - remove sprintf
* remove stdio reference and use get_u8_str
Co-authored-by: Jonavin <=> 
							
						 
						
							2022-07-21 13:44:51 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Albert Y 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d510e80b89 
								
							 
						 
						
							
							
								
								Add Blok 2040 conversion ( #17603 )  
							
							 
							
							
							
						 
						
							2022-07-21 00:54:05 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Wilba 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4efe6330c4 
								
							 
						 
						
							
							
								
								VIA Encoder Map Support ( #17734 )  
							
							 
							
							
							
						 
						
							2022-07-21 09:53:42 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								493d422406 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-20 23:20:34 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mechlovin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a6d70de96a 
								
							 
						 
						
							
							
								
								[Keyboardo] Update PID for mechlovin zed60 ( #17728 )  
							
							 
							
							
							
						 
						
							2022-07-20 16:19:51 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mknj 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a31bbb3fa 
								
							 
						 
						
							
							
								
								fix syntax error ( #17732 )  
							
							 
							
							
							
						 
						
							2022-07-20 22:59:18 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Albert Y 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								05f30f0787 
								
							 
						 
						
							
							
								
								Use Pro Micro pinout for SDA/SCL ( #17595 )  
							
							 
							
							
							
						 
						
							2022-07-20 18:24:34 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								ab45e3b993 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-20 17:00:18 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									takashicompany 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62e3f8b885 
								
							 
						 
						
							
							
								
								Add miniZone Keymap ( #17552 )  
							
							 
							
							
							
						 
						
							2022-07-20 17:59:40 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ben Fiedler 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1db5272154 
								
							 
						 
						
							
							
								
								docs: fix default value of USB_SUSPEND_WAKEUP_DELAY ( #17501 )  
							
							 
							
							... 
							
							
							
							Documents the change made in #12081  
							
						 
						
							2022-07-20 17:43:41 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ee17ffadea 
								
							 
						 
						
							
							
								
								Move Pointing Device code to a subdirectory ( #17684 )  
							
							 
							
							
							
						 
						
							2022-07-20 17:32:00 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								adfa36fee4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-20 15:02:35 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Felix Jen 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								55f16167e4 
								
							 
						 
						
							
							
								
								Added Windz Sinanju to QMK ( #17566 )  
							
							 
							
							
							
						 
						
							2022-07-20 16:01:35 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								fa44f2b21e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-20 00:56:25 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michal 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								00c8e24c6a 
								
							 
						 
						
							
							
								
								[Keymap] Michal Keymap for Sofle rev1 ( #17610 )  
							
							 
							
							
							
						 
						
							2022-07-19 17:55:48 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								12eb6444c6 
								
							 
						 
						
							
							
								
								Add support for PAW3204 Optical Sensor ( #17669 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: gompa <gompa@h-bomb.nl>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me> 
							
						 
						
							2022-07-19 17:46:22 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								6992efb229 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-19 23:24:53 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Duccio 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a7893f207d 
								
							 
						 
						
							
							
								
								Add rgb underglow support and change vendor_id ( #17719 )  
							
							 
							
							
							
						 
						
							2022-07-20 00:24:10 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								d0c095eec2 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-19 15:43:59 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									JW2586 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								32512bbf10 
								
							 
						 
						
							
							
								
								[Keyboard] Waterfowl keyboard support ( #16760 )  
							
							 
							
							... 
							
							
							
							* Added waterfowl files
* Completing PR Checklist
* Added encoders to info.json
* Added license to default keymap
* Update keyboards/waterfowl/keymaps/cyanduck/keymap.c
* Update keyboards/waterfowl/keymaps/default/keymap.c
* Update keyboards/waterfowl/waterfowl.c
* Update keyboards/waterfowl/keymaps/default/keymap.c
* Update keyboards/waterfowl/waterfowl.c
* Update keyboards/waterfowl/waterfowl.c
* Update keyboards/waterfowl/keymaps/cyanduck/keymap.c
* Update keyboards/waterfowl/rules.mk
* Update readme.md
* Update keyboards/waterfowl/waterfowl.c
* Update keyboards/waterfowl/info.json
* Update keyboards/waterfowl/info.json 
							
						 
						
							2022-07-19 08:43:19 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								d458df7698 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-19 10:29:44 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									takashicompany 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								819231afe1 
								
							 
						 
						
							
							
								
								Add keymap for Radialex ( #17662 )  
							
							 
							
							... 
							
							
							
							* fix keymap
* fix keymaps 
							
						 
						
							2022-07-19 11:28:45 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								7a10c3370f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-19 10:14:23 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									David Hoelscher 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1bf95d60e4 
								
							 
						 
						
							
							
								
								[Keyboard] customMK EVO70 ( #14907 )  
							
							 
							
							... 
							
							
							
							* added files for EVO70
* updated info.json and readme
* ran qmk lint and fixed typo in info.json
* removed defines from config.h in favor of info.json
* removed an unnecssary include
* removed unnecessary code
* updated rules.mk to remove mention of Bluetooth
* corrected edit to rules.mk
* added code for OLED menu display
* removed extraneous comments and spaces
* added bongo cat animation
* Update keyboards/custommk/evo70/rules.mk
* Update keyboards/custommk/evo70/config.h
* Modified Bongocat graphics to match original proportions
* updated info.json device version
* updated OLED splash screen display timing
* improved bongo cat tap detection and added backlight breathing to OLED menu
* various improvements to OLED, saving settings, and VIA keymap fix
* removed extraneous define
* custom encoder assignment retained upon powerup, backlight sleep upon suspend
* corrected bongo cat tap detection
* Changed splash screen and bongo cat encoder rotation to use the custom assignments
* removed _default from LAYOUT naming and changed keyboard image to be hosted from imgur
* Force smaller version of image to be used in readme 
							
						 
						
							2022-07-19 03:13:16 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nick Brassel 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1cdde7ba6a 
								
							 
						 
						
							
							
								
								Fix AVR compilation of FNV by using standard integer typenames. ( #17716 )  
							
							 
							
							
							
						 
						
							2022-07-19 05:30:01 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									jack 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								59c7b15b4d 
								
							 
						 
						
							
							
								
								[Keyboard] boardsource/microdox data driven ( #17675 )  
							
							 
							
							
							
						 
						
							2022-07-18 19:20:24 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								e8b14a52de 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-19 02:09:38 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7aea67980b 
								
							 
						 
						
							
							
								
								Update noroadsleft userspace and keymaps (2022-07-18) ( #17714 )  
							
							 
							
							... 
							
							
							
							* kbdfans/kbd75/rev1:noroadsleft - remove LAYOUT_75_ansi_wkl definition
* coseyfannitutti/discipline:noroadsleft - change KC_GESC to KC_ESC
* update Quantum keycode instances in noroadsleft keymaps
- `RESET` -> `QK_BOOT`
- `EEP_RST` -> `EE_CLR`
- `DEBUG` -> `DB_TOGG`
* create and add G_PWD macro 
							
						 
						
							2022-07-18 19:09:05 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joel Challis 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c3f1ba7dd1 
								
							 
						 
						
							
							
								
								Remove full bootmagic config ( #17702 )  
							
							 
							
							
							
						 
						
							2022-07-19 02:28:23 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								eabbc04213 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-18 19:53:40 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Vlasov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								627e35b7ac 
								
							 
						 
						
							
							
								
								Remove Nixpkgs-provided poetry from the environment ( #17673 )  
							
							 
							
							... 
							
							
							
							The `poetry` package from the used Nixpkgs snapshot triggers the regex
compatibility issue in Nix >= 2.10.0 binaries for `x86_64-darwin`:
    https://www.github.com/NixOS/nix/issues/4758 
Remove the `poetry` package from the Nix shell environment for now
(it is not really required to compile QMK, only to develop the Nix shell
environment itself).
In addition, all `poetry` version earlier than 1.1.14 became effectively
non-functional after a breaking change of the PyPI JSON API:
    https://www.github.com/python-poetry/poetry/pull/5973 
Updating the `poetry` package is not trivial (just adding it it to
`pyproject.toml` does not work due to dependency version conflicts with
other modules), therefore removing it seems to be the easiest solution
to restore compatibility with new Nix versions while not creating any
major inconvenience for QMK users. 
							
						 
						
							2022-07-18 22:52:55 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								0e4f953976 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-18 12:20:54 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jason Wihardja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c10d0fc785 
								
							 
						 
						
							
							
								
								Add Support for Massdrop's Stack Overflow The Key V2 ( #17696 )  
							
							 
							
							... 
							
							
							
							* Default Factory Settings
* Change Keyboard Name in Readme
* Fix LED Orders
* Change Brightness Step
* Enable Lighting Layers
* Add RGB Control Mode
* Unblink Layer to Clear Stack
* Add MacOS RGB Control
* Comment Fixes 
							
						 
						
							2022-07-18 13:20:19 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								11cfc8a0b6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-18 12:18:48 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Runheme 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4be736c192 
								
							 
						 
						
							
							
								
								[Keyboard]modify ginkgo65hot ( #17705 )  
							
							 
							
							... 
							
							
							
							modify ginkgo65hot 
							
						 
						
							2022-07-18 13:18:08 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joel Challis 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								42eff8c372 
								
							 
						 
						
							
							
								
								Allow dynamic keymap to compile without via.h ( #17703 )  
							
							 
							
							
							
						 
						
							2022-07-18 11:55:27 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								32cc8a7f43 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-07-17 23:56:05 +00:00