QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								e9b0e9286e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-05-01 01:00:34 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joel Challis 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fc2b51194c 
								
							 
						 
						
							
							
								
								Allow <keyboard>.h to be optional when going data driven ( #12706 )  
							
							 
							
							... 
							
							
							
							* Allow <keyboard>.h to be optional when going data driven
* Remove stub files as no longer required
* Rename function
* Remove include of layouts.h for now
* Take advantage of type=keyboard_folder
* Take advantage of type=keyboard_folder - kb should still be mandatory 
							
						 
						
							2021-05-01 02:00:04 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								876352a030 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-30 20:24:18 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									k.bigwheel 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								18dc12cd78 
								
							 
						 
						
							
							
								
								[Keyboard] Fix bootloader rule for meishi2 keyboard ( #12740 )  
							
							 
							
							
							
						 
						
							2021-05-01 06:23:39 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								109b462789 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-30 17:46:15 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									David Fryer 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								489c814a48 
								
							 
						 
						
							
							
								
								Add breeze variants ( #12596 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Adrian <42110361+xSteins@users.noreply.github.com> 
							
						 
						
							2021-04-30 19:45:36 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								fc29068986 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-29 18:26:09 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8190a795ed 
								
							 
						 
						
							
							
								
								DracuLad: add Configurator data and rework layout macro ( #12727 )  
							
							 
							
							... 
							
							
							
							* add info.json file
* refactor keymaps for readability
* rework layout macro
Arranges the layout macro and keycodes to resemble the physical layout.
* readme touch-up
Corrections to capitalization and spelling, and removal of extra white space. 
							
						 
						
							2021-04-29 11:25:30 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								c05fef752e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-29 16:55:32 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Paul Ewing 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d3963a61cb 
								
							 
						 
						
							
							
								
								Add firmware for CozyKeys Bloomer keyboard ( #12639 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com> 
							
						 
						
							2021-04-29 18:55:01 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								9d5cd52284 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-29 16:49:03 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joel Challis 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4abc3ceb4b 
								
							 
						 
						
							
							
								
								Align drivers.txt with toolbox ( #12741 )  
							
							 
							
							
							
						 
						
							2021-04-30 02:48:34 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								b481f554a0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-29 10:39:51 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Wilba 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								05ee0afd54 
								
							 
						 
						
							
							
								
								Fix F13 LED issue for WT75-B, WT75-C ( #12729 )  
							
							 
							
							
							
						 
						
							2021-04-29 03:39:14 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								39bc8163d0 
								
							 
						 
						
							
							
								
								[CI] Format code according to conventions ( #12731 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: QMK Bot <hello@qmk.fm> 
							
						 
						
							2021-04-29 13:36:47 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d8167779cd 
								
							 
						 
						
							
							
								
								Change RGB/LED Matrix to use a simple define for USB suspend ( #12697 )  
							
							 
							
							
							
						 
						
							2021-04-29 12:39:54 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								7409f03cbf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-28 10:46:45 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nick Brassel 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								54e8dd0885 
								
							 
						 
						
							
							
								
								Fix up bad keycode in  #12405 . ( #12722 )  
							
							 
							
							
							
						 
						
							2021-04-28 11:46:13 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nick Brassel 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0a8e37509b 
								
							 
						 
						
							
							
								
								Fix bad PR merge for  #6580 . ( #12721 )  
							
							 
							
							
							
						 
						
							2021-04-28 11:42:53 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								cd6168ee64 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-28 01:39:39 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Xelus22 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								63cdf80885 
								
							 
						 
						
							
							
								
								add default folder to standard ( #12712 )  
							
							 
							
							
							
						 
						
							2021-04-28 11:39:14 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								d89d341541 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-27 20:55:11 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									alittlepeace 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2af86cec3d 
								
							 
						 
						
							
							
								
								YMDK Wings: Update config.h ( #12718 )  
							
							 
							
							... 
							
							
							
							Adds Caps Lock LED indicator configuration. 
							
						 
						
							2021-04-27 13:54:34 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								e95c76aaed 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-27 19:37:23 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e5cde191e1 
								
							 
						 
						
							
							
								
								Add flashing instructions to GMMK Pro readme ( #12719 )  
							
							 
							
							
							
						 
						
							2021-04-27 12:36:53 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								eea33df1f9 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-27 18:37:47 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									W. Ducky 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7be4047df0 
								
							 
						 
						
							
							
								
								GMMK Pro: Fixed Bootmagic Lite support; personal keymap; VIA support ( #12554 )  
							
							 
							
							... 
							
							
							
							* Added WholesomeDucky keymap for GMMK Pro
* Finalized keymap & added 1000hz polling for GMMK Pro
* Corrected for RAlt and Fn being swapped
* Fixed RAlt and Fn being swapped in the layout definition. Updated personal keymap to reflect fixed layout.
* Removed an old comment from personal keymap for GMMK Pro
* added VIA support
* Defined bootmagic row and column for GMMK Pro Esc key
* Update keyboards/gmmk/pro/config.h
* Update keyboards/gmmk/pro/keymaps/via/keymap.c
* Update keyboards/gmmk/pro/keymaps/via/keymap.c 
							
						 
						
							2021-04-27 11:37:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								3e43a7f044 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-27 17:42:03 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mango The Fourth 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3fe356e65c 
								
							 
						 
						
							
							
								
								Add Draculad keyboard ( #12604 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: mangoiv <mangoiv@outlook.com> 
							
						 
						
							2021-04-27 19:41:11 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								f30637ee11 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-27 17:24:11 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ryan Mitchell 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b95231c1e3 
								
							 
						 
						
							
							
								
								GMMK Pro: add RESET binding, fix layout macro bug ( #12684 )  
							
							 
							
							... 
							
							
							
							* add RESET binding, fix layout mod key bug (fixes  #12683 )
* remove underscore #define and use core's instead 
							
						 
						
							2021-04-27 10:23:41 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								86ab4fcb71 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-27 06:45:17 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f9fb52951d 
								
							 
						 
						
							
							
								
								Update noroadsleft userspace and keymaps (2021-04-26) ( #12711 )  
							
							 
							
							... 
							
							
							
							* Update noroadsleft userspace and keymaps (2021-04-26)
- add Discipline keymap
- move Emulated Non-US Backslash, Numeric Keypad and F13-F24 code fully to userspace
- re-add some custom keycode handling I accidentally deleted
- update VRSN keycode
- update KC60 and userspace readmes
* remove Git readme from kc60 keymap
* update kc60:noroadsleft readme
Concatenates this readme into one file, and updates the image links. 
							
						 
						
							2021-04-26 23:44:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								a8c0954db5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-26 19:18:51 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Andrew Kannan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b5419bd574 
								
							 
						 
						
							
							
								
								Add python-version to gitignore ( #12678 )  
							
							 
							
							
							
						 
						
							2021-04-26 21:18:17 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								171f3e840b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-26 17:24:58 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Xelus22 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8f660ca1e6 
								
							 
						 
						
							
							
								
								[Keyboard] fix planck light via endpoints ( #12701 )  
							
							 
							
							
							
						 
						
							2021-04-26 10:24:19 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									JTM 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								54c1548247 
								
							 
						 
						
							
							
								
								Updated Function96 with V2 files and removed chconf.h and halconf.h ( #12613 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: JuanTapMan <68515848+JuanTapMan@users.noreply.github.com> 
							
						 
						
							2021-04-26 10:38:13 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Xelus22 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9cf82fae95 
								
							 
						 
						
							
							
								
								Add STM32L433 and L443 support ( #12063 )  
							
							 
							
							... 
							
							
							
							* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board  files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Include L443 in compatible microcontrollers
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update config bootloader jump description
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update ChibiOS define reasoning
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update quantum/mcu_selection.mk
Co-authored-by: Nick Brassel <nick@tzarc.org>
* fix git conflict
Co-authored-by: Nick Brassel <nick@tzarc.org> 
							
						 
						
							2021-04-26 13:07:15 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								5168af9a9b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-26 02:52:29 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Xelus22 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f47bafd6a 
								
							 
						 
						
							
							
								
								fix configs ( #12631 )  
							
							 
							
							
							
						 
						
							2021-04-26 12:52:00 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								61a1915cce 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-25 20:46:54 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Luis Moreno 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								417a07c22d 
								
							 
						 
						
							
							
								
								[Config] Add VSCode workspace files to .gitignore ( #12469 )  
							
							 
							
							
							
						 
						
							2021-04-26 06:46:28 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								03db48af75 
								
							 
						 
						
							
							
								
								Format code according to conventions ( #12687 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: QMK Bot <hello@qmk.fm> 
							
						 
						
							2021-04-25 19:01:49 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8c12fa2e59 
								
							 
						 
						
							
							
								
								Format code according to conventions ( #12682 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: QMK Bot <hello@qmk.fm> 
							
						 
						
							2021-04-25 19:00:22 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Purdea Andrei 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f7350732c 
								
							 
						 
						
							
							
								
								Add support for MCU = STM32F446 ( #12619 )  
							
							 
							
							... 
							
							
							
							* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
Co-authored-by: Nick Brassel <nick@tzarc.org> 
							
						 
						
							2021-04-25 18:59:25 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								5b1c3e360a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-25 08:57:56 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Purdea Andrei 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								412e7a03e4 
								
							 
						 
						
							
							
								
								eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. ( #12671 )  
							
							 
							
							
							
						 
						
							2021-04-25 18:57:49 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Xelus22 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								611cd80861 
								
							 
						 
						
							
							
								
								[Keyboard] Ninjin ( #12496 )  
							
							 
							
							... 
							
							
							
							* ninjin init
* put in gpl thing
* underglow
* update to latest chibios
* fix gpl headers
* remove other files
* fix header
* Update keyboards/xelus/ninjin/readme.md
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update keyboards/xelus/ninjin/mcuconf.h
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update keyboards/xelus/ninjin/halconf.h
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Nick Brassel <nick@tzarc.org> 
							
						 
						
							2021-04-25 18:57:22 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								23e70fa857 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-04-25 04:03:14 +00:00