ethsol 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a939adb55c 
								
							 
						 
						
							
							
								
								Sentence correction ( #16650 )  
							
							 
							
							
							
						 
						
							2022-03-14 22:20:50 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								6f98a67eda 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-14 22:06:16 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Yakbats 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6c11579876 
								
							 
						 
						
							
							
								
								[Keyboard] Add via keymap to AL1 ( #16499 )  
							
							 
							
							
							
						 
						
							2022-03-14 15:05:39 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Stefan Kerkmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7e669421f8 
								
							 
						 
						
							
							
								
								Rename TICK to TICK_EVENT to prevent naming conflicts ( #16649 )  
							
							 
							
							
							
						 
						
							2022-03-14 20:06:21 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								2648a7a125 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-14 18:08:44 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Danny 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a12d58c6c9 
								
							 
						 
						
							
							
								
								[Keyboard] Add BAMFK-1 ( #16409 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2022-03-14 11:08:10 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								1d1d7c388d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-14 13:58:40 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ryan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a6a333c75 
								
							 
						 
						
							
							
								
								Disable RGB matrix pixel animations for some boards ( #16643 )  
							
							 
							
							... 
							
							
							
							* idobao/id87/v2: disable RGB matrix pixel animations
* Same for two more boards 
							
						 
						
							2022-03-14 13:58:05 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ryan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5fb269b2b4 
								
							 
						 
						
							
							
								
								keebio/iris: Add ifdefs to encoder callbacks ( #16642 )  
							
							 
							
							
							
						 
						
							2022-03-14 13:57:44 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								cd2fca667b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-14 01:57:26 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joel Challis 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c17323b0f5 
								
							 
						 
						
							
							
								
								bolsa/damapad - Fix missing layout macro ( #16639 )  
							
							 
							
							
							
						 
						
							2022-03-13 18:56:52 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									jack 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								86a35483a1 
								
							 
						 
						
							
							
								
								Mousekeys fix ( #16640 )  
							
							 
							
							
							
						 
						
							2022-03-13 18:53:53 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b8574efcd6 
								
							 
						 
						
							
							
								
								Fix oneshot toggle logic ( #16630 )  
							
							 
							
							... 
							
							
							
							* Fix oneshot toggle logic
* Enable oneshots by default
* Decrement eeconfig magic number due to eeconfig changes 
							
						 
						
							2022-03-14 01:11:42 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								42d084d1c0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-14 01:04:40 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									jack 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8d90cf36f1 
								
							 
						 
						
							
							
								
								Fix 40percentclub USB descriptors ( #16638 )  
							
							 
							
							
							
						 
						
							2022-03-14 12:04:11 +11:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								921b9dad6c 
								
							 
						 
						
							
							
								
								[Core] Move has_mouse_report_changed function to report.c  ( #16543 )  
							
							 
							
							... 
							
							
							
							* Move 'has_mouse_report_changed' checkto report.c
* change mousekeys to use memcpy
* fix linting issues 
							
						 
						
							2022-03-14 00:01:47 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								cc9a2aef0f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-13 23:56:16 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ryan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dde4120a1e 
								
							 
						 
						
							
							
								
								ISP flashing guide: add instructions for flashing STM32duino bootloader ( #16568 )  
							
							 
							
							
							
						 
						
							2022-03-13 23:55:47 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								5eb3fc255b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-13 23:55:18 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ryan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c0f4179117 
								
							 
						 
						
							
							
								
								Move keyboard USB IDs and strings to data driven: 0-9 ( #16481 )  
							
							 
							
							
							
						 
						
							2022-03-13 23:54:49 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								338cf71ee9 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-13 23:46:46 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ryan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								df3770551a 
								
							 
						 
						
							
							
								
								USB-USB converter cleanup ( #16618 )  
							
							 
							
							
							
						 
						
							2022-03-13 23:46:13 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								3f83a21383 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-13 21:50:20 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Spencer Peterson 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8fe3864fe7 
								
							 
						 
						
							
							
								
								[Keyboard] Add "Uno" rev2 ( #14071 )  
							
							 
							
							... 
							
							
							
							* [Keyboard] Add "Uno" rev2
Adds support for the second revision of Uno, courtesy of @Snipeye.
* Update keyboards/uno/rev2/rules.mk
* Update keyboards/uno/rev1/rules.mk
* Update keyboards/uno/uno.h
* Update keyboards/uno/rev2/rules.mk
* Update keyboards/uno/rev1/rules.mk
* Update keyboards/uno/keymaps/demo/keymap.c
* Update keyboards/uno/keymaps/demo/keymap.c
* Update keyboards/uno/keymaps/demo/keymap.c
* Update keyboards/uno/rev2/rules.mk
* Update keyboards/uno/rev1/rules.mk
* Align rules.mk comments
* Update keyboards/uno/info.json
* Update keyboards/uno/rev1/config.h
* Update keyboards/uno/rev2/config.h
* Update keyboards/uno/rev2/config.h
* Update keyboards/uno/rev2/config.h
* Update keyboards/uno/rev1/config.h 
							
						 
						
							2022-03-13 14:49:47 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								2df28c1850 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-13 17:31:22 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									jels 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								109c60feeb 
								
							 
						 
						
							
							
								
								[Keyboard] Add support for Jels60 ( #16605 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com> 
							
						 
						
							2022-03-13 10:30:55 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								e226a70adc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-13 13:57:24 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Takeshi ISHII 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b906af0073 
								
							 
						 
						
							
							
								
								helix:edvorakjp keymap change to use split_common ( #16532 )  
							
							 
							
							
							
						 
						
							2022-03-13 13:56:56 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								16fab460fd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-13 10:10:03 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									jpe230 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1f63dbfb8e 
								
							 
						 
						
							
							
								
								[Keymap] Update personal crkbd keymap ( #16624 )  
							
							 
							
							
							
						 
						
							2022-03-13 03:09:36 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								8ff2497384 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-13 10:09:12 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									jack 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								08794fef4e 
								
							 
						 
						
							
							
								
								[Keyboard] add missing endif in glitch keyboard ( #16629 )  
							
							 
							
							
							
						 
						
							2022-03-13 03:08:33 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								55b53006a5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-13 07:37:55 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Matthew Dias 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dccb5711c7 
								
							 
						 
						
							
							
								
								[Keyboard] Add damapad ( #16443 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2022-03-12 23:37:22 -08:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								ebe87aa67e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-13 07:36:50 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Matthew Dias 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20424fd37f 
								
							 
						 
						
							
							
								
								[Keyboard] Add Glitch ( #16444 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2022-03-12 23:36:12 -08:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								4281beb1de 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-12 12:42:55 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Kriechbaumer 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								86b123141b 
								
							 
						 
						
							
							
								
								docs: fix code sample ( #16623 )  
							
							 
							
							
							
						 
						
							2022-03-12 12:42:25 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joel Challis 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dd32cdf527 
								
							 
						 
						
							
							
								
								Redo workaround for pin_def errors on KINETIS ( #16620 )  
							
							 
							
							... 
							
							
							
							* Redo workaround for pin_def errors on KINETIS
* Redo workaround for pin_def errors on KINETIS 
							
						 
						
							2022-03-11 18:50:59 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Pascal Getreuer 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0eb42e042c 
								
							 
						 
						
							
							
								
								Fix flipped One Shot logic ( #16617 )  
							
							 
							
							
							
						 
						
							2022-03-11 13:28:52 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joel Challis 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1833e65370 
								
							 
						 
						
							
							
								
								Workaround for pin_def errors on KINETIS ( #16614 )  
							
							 
							
							
							
						 
						
							2022-03-11 13:27:29 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								0015ebad47 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-11 13:26:21 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f79708095 
								
							 
						 
						
							
							
								
								Acheron Elongate Delta: add info.json ( #16615 )  
							
							 
							
							
							
						 
						
							2022-03-11 13:26:15 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								74b24e410b 
								
							 
						 
						
							
							
								
								DZ64RGB: add info.json ( #16616 )  
							
							 
							
							
							
						 
						
							2022-03-11 13:25:31 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								e3404d21fe 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-11 05:03:12 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mechlovin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								003231aaf2 
								
							 
						 
						
							
							
								
								[Keyboard] Add Mechlovin Infinity87.5 PCB ( #15163 )  
							
							 
							
							... 
							
							
							
							* add infinity87.5
* Update readme.md
* Update keyboards/mechlovin/infinity875/config.h
* Update keyboards/mechlovin/infinity875/info.json
* Update keyboards/mechlovin/infinity875/rules.mk
* Update keyboards/mechlovin/infinity875/rules.mk
* Update keyboards/mechlovin/infinity875/config.h
* Enable RGB matrix effect
* update keymap default
* undef RGB matrix effect
* Update keyboards/mechlovin/infinity875/rules.mk
* Update keyboards/mechlovin/infinity875/rules.mk
* Update keyboards/mechlovin/infinity875/rules.mk
* Update keyboards/mechlovin/infinity875/readme.md
* Update keyboards/mechlovin/infinity875/infinity875.h
* Update keyboards/mechlovin/infinity875/infinity875.h
* Update keyboards/mechlovin/infinity875/info.json
* Update keyboards/mechlovin/infinity875/infinity875.h
* Update keyboards/mechlovin/infinity875/infinity875.h
* Update keyboards/mechlovin/infinity875/info.json
* Update keyboards/mechlovin/infinity875/info.json
* Update keyboards/mechlovin/infinity875/info.json 
							
						 
						
							2022-03-10 21:02:40 -08:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joel Challis 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7e6f1c9e08 
								
							 
						 
						
							
							
								
								Force platform pin defs to be included ( #16611 )  
							
							 
							
							... 
							
							
							
							* Force platform pin defs to be included
* Always grab first header 
							
						 
						
							2022-03-10 23:53:16 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								e9458fd694 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-10 23:28:26 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rocco Meli 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ee71362f99 
								
							 
						 
						
							
							
								
								Personal user space and CRKBD R2G keymap ( #15888 )  
							
							 
							
							... 
							
							
							
							* r2g folder groundwork
* Default mb keymap featuring mb logos
* Migrate Oled to keyboard folder
* Move rules configs to support config better
* update readmes
* Liscnece update
* Update config and fix issues caused by redef errs
* funciton name adjusts, define specific rgb modes
* move default oled font to postconfig
* update oled in line with develop merge
* fix return value
* Add some default rgb matrix defines
* del ugfx
* remove #include <stdio.h>
* create personal keymap for r2g
* reduce firmware size
* change keymap to follow physical layout
* remove RGBlight config lines to make both sides work (@Dasky on MechboardsUK Discord)
* strip down configuration, similar to crkbd/r2g:mb_via
* remove wrong oled code overwriting the r2g one
* broken code with RGB matrix (briks right side)
* remove high max brightness limit
* caps lock tap dance and RGB indicator for active caps lock
* fix caps lock led on right side
* add test macro
* remove latex macro which is too slow
* move caps lock tap dance to RALT and add space cadet shift
* switch CTL with ALT in first layer
* add tap dance for ESC/DEL
* space cadet tap dance with caps lock; shift works by needs a short pause
* add space cadet tap dance with caps lock on the right; shift works by needs a short pause and does not hold
* make more keys transparent
* enable auto shift and use logo on both oleds
* add user oled logo, slows down linking considerably
* oled name
* add arrow keys in usual configuration and add linear configuration to symbol layer
* add unicoede support
* add accents
* update to latest version
* add colemak dh layer
* report auto shift timeout
* define layer name shorcuts correctly
* disable VIA to enable more layers
* enable NKRO
* move some rules and unicode to user space
* move oled and tap dances to user space
* move tap dances fully out of keymap
* expand unicode map
* fix unicode code
* revert changes to r2g, make it equal to merged code
* revert changes to r2g, make it equal to merged code
* clang-format userspace
* clang-format config file
* Update keyboards/crkbd/keymaps/rmeli/keymap.c
* replace define with enum
* add licenses 
							
						 
						
							2022-03-10 15:27:37 -08:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								31eb82c911 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2022-03-10 21:34:11 +00:00