QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								2e76b24db6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-26 05:22:33 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								532cfd56ca 
								
							 
						 
						
							
							
								
								Exclusive E6 RGB Refactor ( #14604 )  
							
							 
							
							
							
						 
						
							2021-09-26 15:22:04 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								c576b11008 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-26 04:54:31 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8c76e1ec08 
								
							 
						 
						
							
							
								
								FLX Virgo: metadata clean-up ( #14605 )  
							
							 
							
							... 
							
							
							
							* correct maintainer field in info.json
* remove KBFirmware Parser references 
							
						 
						
							2021-09-25 21:53:57 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								3b9a401036 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-25 19:26:16 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3296c26c98 
								
							 
						 
						
							
							
								
								Saka68 Solder Refactor ( #14596 )  
							
							 
							
							... 
							
							
							
							* rename LAYOUT to LAYOUT_68_ansi
* tidy-up keymaps
Adjusts indenting for readability/aesthetics.
* add LAYOUT_68_iso macro
* enable Community Layout support
* add Split Backspace layout variants
* remove KBFirmware Parser references
* correct keyboard metadata 
							
						 
						
							2021-09-25 12:25:43 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								32dca0e19d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-25 18:03:37 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5c2d15573d 
								
							 
						 
						
							
							
								
								Saka68 Hotswap Refactor ( #14595 )  
							
							 
							
							... 
							
							
							
							* rename LAYOUT to LAYOUT_68_ansi
* tidy-up keymaps
Adjusts indenting for readability/aesthetics.
* remove default keymap readme
* add LAYOUT_68_iso macro
* enable Community Layout support
* remove KBFirmware Parser references
* correct keyboard metadata
* specify keyboard variant in info.json and config.h
* correct maintainer field in info.json 
							
						 
						
							2021-09-25 11:03:00 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1bf49fc97 
								
							 
						 
						
							
							
								
								Remove GCC version check from song list inclusion ( #14600 )  
							
							 
							
							
							
						 
						
							2021-09-25 18:35:27 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								ab82ca1789 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-25 16:50:23 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Bahrul Hidayat 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aee0b0097b 
								
							 
						 
						
							
							
								
								[Keyboard] add keyboard dyz_TKL ( #14535 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com> 
							
						 
						
							2021-09-25 09:49:58 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								ea451cbe8e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-25 16:49:53 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Bahrul Hidayat 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								29079e54f1 
								
							 
						 
						
							
							
								
								[Keyboard] add keyboard dyz40 ( #14533 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com> 
							
						 
						
							2021-09-25 09:49:26 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								2c415a8b61 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-25 16:49:17 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Bahrul Hidayat 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8b0b858db9 
								
							 
						 
						
							
							
								
								[Keyboard] add keyboard selka40 ( #14560 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com> 
							
						 
						
							2021-09-25 09:48:47 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								ebd81b3217 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-25 16:48:23 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Albert Y 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c74bd72d4f 
								
							 
						 
						
							
							
								
								[Keyboard] Fix pin spacing alignmnent ( #14592 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: filterpaper <filterpaper@localhost> 
							
						 
						
							2021-09-25 09:47:56 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								a857956a3c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-25 08:31:52 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ryan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								68c327f672 
								
							 
						 
						
							
							
								
								Remove keyboard-level COMBO_ENABLE rules ( #14550 )  
							
							 
							
							
							
						 
						
							2021-09-25 18:31:24 +10:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								8fa9312b0f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-24 23:30:19 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3be47b3eaa 
								
							 
						 
						
							
							
								
								[Keyboard] Fix default keymap for Potato65s ( #14587 )  
							
							 
							
							
							
						 
						
							2021-09-25 00:29:47 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								7deac7ada3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-24 23:29:40 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								216620ee76 
								
							 
						 
						
							
							
								
								tidy up Clawsome Boards info.json files ( #14586 )  
							
							 
							
							... 
							
							
							
							* removes `meta` field
* changes `maintainer` field to use GitHub username 
							
						 
						
							2021-09-25 00:29:08 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								cf7b59389e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-24 23:28:56 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9e87b47a9c 
								
							 
						 
						
							
							
								
								Aozora Hotswap info.json clean-up ( #14585 )  
							
							 
							
							... 
							
							
							
							* clean up info.json
* correct maintainer field to use GitHub username
* remove `meta` key
* clean up readme.md
* correct key count in intro paragraph 
							
						 
						
							2021-09-25 00:28:25 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joel Challis 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3a2a39e5ec 
								
							 
						 
						
							
							
								
								Initial pass of F405 support ( #14584 )  
							
							 
							
							... 
							
							
							
							* Initial pass of F405 support
* remove some conf files
* docs
* clang 
							
						 
						
							2021-09-25 00:19:41 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1dfbfbfd3 
								
							 
						 
						
							
							
								
								[Keyboard] Fix typo in mechloving adelais header files ( #14590 )  
							
							 
							
							
							
						 
						
							2021-09-25 00:15:33 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20d3dc0c83 
								
							 
						 
						
							
							
								
								Patch for develop branch merge conflicts  
							
							 
							
							... 
							
							
							
							Fixes bugs introduced by 675c5a5e12 . 
							
						 
						
							2021-09-24 12:42:57 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Drashna Jael're 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								675c5a5e12 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-24 12:21:32 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Stan Gurenkov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4493a05b74 
								
							 
						 
						
							
							
								
								[Keyboard] refactor signum30 ( #14527 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Stan Gurenkov <stan.gurenkov@docusign.com> 
							
						 
						
							2021-09-24 10:05:29 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								60b13d04cd 
								
							 
						 
						
							
							
								
								Alf X2 Refactor ( #14572 )  
							
							 
							
							
							
						 
						
							2021-09-24 09:29:58 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								076a332613 
								
							 
						 
						
							
							
								
								Swift65 Solder Refactor ( #14579 )  
							
							 
							
							
							
						 
						
							2021-09-24 09:29:46 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									WiZ.GG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3778dd5727 
								
							 
						 
						
							
							
								
								[Keyboard] add 2 keys in jkb65 keymap ( #14576 )  
							
							 
							
							
							
						 
						
							2021-09-24 09:29:18 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Andrew Braini 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								863d9c35fe 
								
							 
						 
						
							
							
								
								[Keyboard] Create the battleship gamepad keyboard. ( #14551 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-09-24 09:27:29 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aeonstrife 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								257bc473e5 
								
							 
						 
						
							
							
								
								[Keyboard] Add Potato65 Solderable PCB ( #14047 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-09-24 09:13:53 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nick Abe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								768803ef72 
								
							 
						 
						
							
							
								
								[Keyboard] PLX info.json update ( #14536 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-09-24 08:57:08 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nick Abe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2d079c984f 
								
							 
						 
						
							
							
								
								[Keyboard] Add Rotor Keyboard ( #14407 )  
							
							 
							
							... 
							
							
							
							* rotor keyboard
* readme image
* info.json update
* Update readme.md
* Update keyboards/rotor/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/rotor/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-09-24 08:56:37 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									clickclackwho 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f37084677 
								
							 
						 
						
							
							
								
								[Docs] Broken FAQ hyperlink ( #14578 )  
							
							 
							
							
							
						 
						
							2021-09-24 08:43:05 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Albert Engelbrecht 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77bb907fee 
								
							 
						 
						
							
							
								
								[Keyboard] Added A. Dux keyboard configurations ( #14320 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-09-24 00:30:52 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									phrygiandesign 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c6f92e37aa 
								
							 
						 
						
							
							
								
								[Keyboard] Add phrygian design ph100 ( #13738 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-09-24 00:25:33 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mechlovin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fcb7c7b04f 
								
							 
						 
						
							
							
								
								[Keyboard] Add Adelais PCB. Adelais RGB rev.3, Adelais rev. 4 APM32F103, Adelais AVR rev. 1 ( #14252 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-09-24 00:13:23 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ryanbughuang 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c242693ec7 
								
							 
						 
						
							
							
								
								[Keyboard] Add sam/sg81m layout ( #13432 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Joel Challis <git@zvecr.com> 
							
						 
						
							2021-09-23 23:41:05 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Albert Y 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e36c2cbf90 
								
							 
						 
						
							
							
								
								[Keyboard] Disable console on Sofle for size concerns ( #14577 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: filterpaper <filterpaper@localhost> 
							
						 
						
							2021-09-23 23:32:40 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									umi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								30140f48d0 
								
							 
						 
						
							
							
								
								[Docs] update Japanese translation of pr_checklist.md ( #13693 )  
							
							 
							
							... 
							
							
							
							* update pr_checklist.md translation
* update file based on comments
* add id on feature_led_indicators.md and update text based on comments
* update file based on comments
* update file based on comment 
							
						 
						
							2021-09-24 14:51:34 +09:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sets3n 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4e42bde4a 
								
							 
						 
						
							
							
								
								kk980 - Fix Configurator rendering ( #14556 )  
							
							 
							
							... 
							
							
							
							* add kk980
* fix
* fix config.h
* Modified readme.md
* fix
* Modified format.
* Modified image.
* Modified rules.mk
* Modified rules.mk + #
* fix info.json: keys dislocation 
							
						 
						
							2021-09-23 20:16:20 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Drashna Jaelre 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a68c4d8b81 
								
							 
						 
						
							
							
								
								[Keyboard] Update default keymaps for OLKB boards ( #14565 )  
							
							 
							
							
							
						 
						
							2021-09-23 20:08:23 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								29f199f456 
								
							 
						 
						
							
							
								
								AMJ96 Refactor ( #14571 )  
							
							 
							
							... 
							
							
							
							* clean up amj96.h
- use #pragma once include guard
- remove extra comments
- update matrix position alignment (easier readability)
* info.json: apply human-friendly formatting
* rename LAYOUT to LAYOUT_all
* clean up rules.mk
Align to QMK's AVR template.
* clean up default keymap
- use four-space indent
- add RESET keycode (Fn+R)
- remove unnecessary functions
* clean up config.h
- use #pragma once include guard
- move lighting settings to the middle of the file (QMK template conformance)
- remove Magic and MIDI configuration blocks
* update readme.md file
- update keyboard info list
- add flashing instructions
- update Docs links
- remove trailing spaces
* remove "empty" config.h and readme.md from default keymap 
							
						 
						
							2021-09-23 11:01:49 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								d7e61e56bb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-23 08:32:00 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								66857b919b 
								
							 
						 
						
							
							
								
								Wuque Mammoth20x Layout Macro Refactor ( #14568 )  
							
							 
							
							... 
							
							
							
							* mammoth20x: edit size of RightEncode key in Configurator
* physically arrange layout macro
Arranges the keycodes to resemble the assembled board.
* rename LAYOUT_default to LAYOUT
Includes "layout_aliases" tree in info.json for backwards compatibility.
* rules.mk touch-up
* convert tabs to spaces
* add line break before ENCODER_ENABLE (not included in QMK's template)
* readme.md touch-up
* remove zero-width space characters
* markdown fix for info paragraph
* update link text 
							
						 
						
							2021-09-23 01:31:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James Young 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c679911f3d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into develop  
							
							 
							
							
							
						 
						
							2021-09-23 00:59:31 -07:00