QMK Bot 
							
						 
					 
					
						
						
							
						
						64e162af25 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-19 03:16:10 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nuno Costa 
							
						 
					 
					
						
						
							
						
						307c97445b 
					 
					
						
						
							
							[Keyboard] Quadrant by Ealdin ( #11747 )  
						
						 
						
						... 
						
						
						
						Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Joel Challis <git@zvecr.com >
Co-authored-by: Ryan <fauxpark@gmail.com > 
						
						
					 
					
						2021-02-18 19:15:38 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						84ee7e4fa8 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-18 23:44:10 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Drashna Jaelre 
							
						 
					 
					
						
						
							
						
						cd8c71a0eb 
					 
					
						
						
							
							[Keyboard] Phase Studio's Titan 65 ( #11920 )  
						
						 
						
						
						
						
					 
					
						2021-02-18 23:43:34 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						3716b2938c 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-18 23:33:35 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Young 
							
						 
					 
					
						
						
							
						
						8c1cdceb8b 
					 
					
						
						
							
							Beegboy handwired by swiftrax: correct info.json object order ( #11924 )  
						
						 
						
						... 
						
						
						
						* human-friendly formatting
* correct key object order 
						
						
					 
					
						2021-02-18 23:33:02 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						9407392b14 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-18 20:32:29 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								qpockets 
							
						 
					 
					
						
						
							
						
						890f3a57b6 
					 
					
						
						
							
							add eggman keyboard ( #11701 )  
						
						 
						
						... 
						
						
						
						* add eggman keyboard
* Update info.json
* Update eggman.h
correct copyright info
* Update eggman.c
correct copyright info
* Update config.h
correct copyright info
* Update keymap.c
correct copyright info
* Update keyboards/eggman/readme.md
reduce image size
Co-authored-by: Ryan <fauxpark@gmail.com >
* Update keyboards/eggman/keymaps/default/config.h
correct copyright
Co-authored-by: Joshua Diamond <josh@windowoffire.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
Co-authored-by: Joshua Diamond <josh@windowoffire.com > 
						
						
					 
					
						2021-02-18 15:31:58 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						8b6a9e2ae9 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-18 20:31:38 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MechMerlin 
							
						 
					 
					
						
						
							
						
						9e05810cfe 
					 
					
						
						
							
							Budget96 VIA ( #11737 )  
						
						 
						
						... 
						
						
						
						* add budget96 via keymap and adjust vid and pids
* update dates
* Update keyboards/donutcables/budget96/keymaps/default/keymap.c
Co-authored-by: Joshua Diamond <josh@windowoffire.com >
Co-authored-by: Joshua Diamond <josh@windowoffire.com > 
						
						
					 
					
						2021-02-18 15:31:09 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dominic Gan 
							
						 
					 
					
						
						
							
						
						f4f5ddfec2 
					 
					
						
						
							
							Add UTD80 PCB ( #11799 )  
						
						 
						
						... 
						
						
						
						* Create readme.md
* Add files via upload
* Create readme.md
* Add files via upload
* Update utd80.h
* Update utd80.c
* Update keymap.c
Change 6 length underscore to 7.
* Update keyboards/utd80/readme.md
Co-Authored-By: Drashna Jaelre <drashna@live.com >
* Update keyboards/utd80/readme.md
Co-Authored-By: Drashna Jaelre <drashna@live.com >
* Update keyboards/utd80/readme.md
Co-Authored-By: Drashna Jaelre <drashna@live.com >
* Update keyboards/utd80/readme.md
Co-Authored-By: fauxpark <fauxpark@gmail.com >
* Update keyboards/utd80/readme.md
Co-Authored-By: fauxpark <fauxpark@gmail.com >
* Update utd80.c
* Update utd80.c
* Update keymap.c
* Apply #7701  PR review suggestions
* Add GPL license headers
* Replace led implementation with definition
* Add VIA keymap for UTD80
* Update attributions
Co-authored-by: UTDKeyboard <59077857+utdkeyboard@users.noreply.github.com >
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: fauxpark <fauxpark@gmail.com > 
						
						
					 
					
						2021-02-18 15:30:16 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						381429c039 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-17 22:43:50 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sid Carter 
							
						 
					 
					
						
						
							
						
						50c4afa841 
					 
					
						
						
							
							Personal keymap for kbd67 and some cleanup ( #11937 )  
						
						 
						
						... 
						
						
						
						Co-authored-by: Khader Syed <khader.syed@aicure.com > 
						
						
					 
					
						2021-02-18 09:43:14 +11:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						f89708c942 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-17 22:25:55 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Donald Kjer 
							
						 
					 
					
						
						
							
						
						1d44715d9d 
					 
					
						
						
							
							Fixing typos in durgod/k320 readme ( #11931 )  
						
						 
						
						
						
						
					 
					
						2021-02-18 09:25:03 +11:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								github-actions[bot] 
							
						 
					 
					
						
						
							
						
						a5f63dbf93 
					 
					
						
						
							
							Format code according to conventions ( #11936 )  
						
						 
						
						... 
						
						
						
						Co-authored-by: QMK Bot <hello@qmk.fm > 
						
						
					 
					
						2021-02-17 17:30:16 +11:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						fad659650b 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-17 06:29:48 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								shela 
							
						 
					 
					
						
						
							
						
						fe7240628a 
					 
					
						
						
							
							fix build error ( #11939 )  
						
						 
						
						
						
						
					 
					
						2021-02-17 17:29:15 +11:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan 
							
						 
					 
					
						
						
							
						
						be70f466fe 
					 
					
						
						
							
							Fix compilation error for tap_code_delay() ( #11938 )  
						
						 
						
						
						
						
					 
					
						2021-02-17 17:26:57 +11:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						5688655971 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-16 23:14:03 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Konstantin Shpits 
							
						 
					 
					
						
						
							
						
						bf3ee94b9a 
					 
					
						
						
							
							[Keyboard] Add VIA support for YMD 75 ( #11811 )  
						
						 
						
						... 
						
						
						
						Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Ryan <fauxpark@gmail.com > 
						
						
					 
					
						2021-02-16 15:13:30 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						842a8b35dd 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-16 23:10:57 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alabahuy 
							
						 
					 
					
						
						
							
						
						e43ead8e96 
					 
					
						
						
							
							[Keyboard] Add Rartand keyboard and support via ( #11828 )  
						
						 
						
						
						
						
					 
					
						2021-02-16 15:10:26 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan 
							
						 
					 
					
						
						
							
						
						3345ce2686 
					 
					
						
						
							
							Add tap_code_delay(code, delay) ( #11913 )  
						
						 
						
						... 
						
						
						
						Co-authored-by: Drashna Jaelre <drashna@live.com > 
						
						
					 
					
						2021-02-17 07:26:52 +11:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						cdb9d55956 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-16 19:27:59 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rozakiin 
							
						 
					 
					
						
						
							
						
						2d55f34413 
					 
					
						
						
							
							[Keyboard] Add Noxary 268.2 RGB ( #11772 )  
						
						 
						
						... 
						
						
						
						Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
Co-authored-by: Ruari <ruari.armstrong@gmail.com > 
						
						
					 
					
						2021-02-16 11:27:20 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						899f8b0cde 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-16 18:11:23 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								andresteare 
							
						 
					 
					
						
						
							
						
						d754266a6d 
					 
					
						
						
							
							[Keyboard] Added two handwired keyboards ( #11696 )  
						
						 
						
						... 
						
						
						
						Co-authored-by: Ryan <fauxpark@gmail.com > 
						
						
					 
					
						2021-02-16 10:10:49 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						d565586e46 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-16 18:10:43 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Max Bridgland 
							
						 
					 
					
						
						
							
						
						ac33dc12da 
					 
					
						
						
							
							[Keyboard] Add VIA keymap to duckyPad, update M4cs keymap for duckyPad ( #11703 )  
						
						 
						
						... 
						
						
						
						Co-authored-by: M4cs <mabridgland@protonmail.com > 
						
						
					 
					
						2021-02-16 10:10:07 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						65326f7d1f 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-16 17:46:35 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mrT1ddl3s 
							
						 
					 
					
						
						
							
						
						9a2b0a5db1 
					 
					
						
						
							
							[Keyboard] Knob Goblin add via support ( #11831 )  
						
						 
						
						... 
						
						
						
						Co-authored-by: Ryan <fauxpark@gmail.com >
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Joel Challis <git@zvecr.com > 
						
						
					 
					
						2021-02-16 09:46:02 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						e545cc0b47 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-16 17:45:34 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Stefan Schulze 
							
						 
					 
					
						
						
							
						
						4a10dfb54d 
					 
					
						
						
							
							Fix submodule check for qmk setup ( #11379 )  
						
						 
						
						... 
						
						
						
						The initialization of the submodules would succeed, but the result of the subsequent
check_submodules() run wasn't checked correctly.
Co-authored-by: Stefan Schulze <stefan.andre.schulze@posteo.de > 
						
						
					 
					
						2021-02-16 09:45:05 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan 
							
						 
					 
					
						
						
							
						
						53b96f685d 
					 
					
						
						
							
							RGBLight: Allow configurable default settings ( #11912 )  
						
						 
						
						... 
						
						
						
						* RGBLight: Allow configurable default settings
* Docs 
						
						
					 
					
						2021-02-16 10:51:28 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						02b5bb9b17 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-16 15:50:59 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniil Kivenko 
							
						 
					 
					
						
						
							
						
						95304f269b 
					 
					
						
						
							
							[Keymap] Adding HHKB Keymap for dz60rgb_wkl:v2 ( #11840 )  
						
						 
						
						... 
						
						
						
						* adding new hhkb layout
* adding license header
* fix end of lines symbol
Co-authored-by: Daniil Kivenko <d.kivenko@evrone.com >
Co-authored-by: Daniil macbet Kivenko <macbet@wisebits.com > 
						
						
					 
					
						2021-02-16 10:50:15 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						b492d8499c 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-16 15:46:05 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt Gilbert 
							
						 
					 
					
						
						
							
						
						43e314b64e 
					 
					
						
						
							
							Add mattir2 keymap for Kyria ( #11752 )  
						
						 
						
						... 
						
						
						
						* added files to support my 2nd kyria
* fixed missing line
* swapped thumb keys
* Update keyboards/kyria/keymaps/mattir2/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Drashna Jaelre <drashna@live.com > 
						
						
					 
					
						2021-02-16 10:45:28 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						0f41011ec9 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-16 02:53:36 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								xgnxs 
							
						 
					 
					
						
						
							
						
						3559284839 
					 
					
						
						
							
							Update IGNORE_MOD_TAP_INTERRUPT ( #11452 )  
						
						 
						
						... 
						
						
						
						Current wording of IGNORE_MOD_TAP_INTERRUPT is incorrect, and very confusing when attempting to correct a somewhat common issue for quick typists that have Mod-Tap on a commonly used key.  Research indicates this wording has been incorrect for some time, and has tripped up others attempting to solve the issue of Mod + Key being sent, when Tap + Key is expected after quickly pressing keys. 
						
						
					 
					
						2021-02-15 21:52:57 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joshua Diamond 
							
						 
					 
					
						
						
							
						
						d36dbe66e1 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-15 20:55:54 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yiancar 
							
						 
					 
					
						
						
							
						
						3fed8bced7 
					 
					
						
						
							
							Dc01 fixes ( #11843 )  
						
						 
						
						... 
						
						
						
						* dc01-fixes
* dc01-fixes
* Cleanup and add VIA
* Updated JSONs
* fix 
						
						
					 
					
						2021-02-15 20:36:58 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								github-actions[bot] 
							
						 
					 
					
						
						
							
						
						b0e161e33d 
					 
					
						
						
							
							Format code according to conventions ( #11928 )  
						
						 
						
						... 
						
						
						
						Co-authored-by: QMK Bot <hello@qmk.fm > 
						
						
					 
					
						2021-02-16 11:33:03 +11:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								XScorpion2 
							
						 
					 
					
						
						
							
						
						d1806a26e4 
					 
					
						
						
							
							Split transport mirror ( #11046 )  
						
						 
						
						... 
						
						
						
						* Split transport mirror support
* Updated RGB Matrix to respond to electrical events instead of key events
* split matrix slave fix 
						
						
					 
					
						2021-02-16 11:30:33 +11:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Brassel 
							
						 
					 
					
						
						
							
						
						1bc8a6e5d4 
					 
					
						
						
							
							ChibiOS conf migrations... take 14 ( #11927 )  
						
						 
						
						... 
						
						
						
						* ChibiOS conf upgrade for geminate60
 geminate60 - a2765e46491151a8de309bc1cc8ce7e953ee1e50
* ChibiOS conf upgrade for sowbug/68keys
 sowbug/68keys - 7475a03ff2d704497d503a002b6c5dbac12f0a84
* ChibiOS conf upgrade for sowbug/ansi_tkl
 sowbug/ansi_tkl - 87be98eb6ed03a8752c1082c872a8a75b1d00ae7 
						
						
					 
					
						2021-02-16 11:28:42 +11:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Young 
							
						 
					 
					
						
						
							
						
						fa740f8129 
					 
					
						
						
							
							AMJ40 Refactor ( #11854 )  
						
						 
						
						... 
						
						
						
						* update keyboard source files
- add license headers (attributed to original keyboard submitter)
- #pragma once include guards
- file template matching
- readme update and template matching
* set sensible default keyboard settings
- enable Bootmagic Lite and Mouse Keys
- disable Console and Command
- remove default keymap's rules.mk file
* remove unnecessary files from default keymap
* refactor default keymap
* add additional layouts/keymaps
* update keyboard readme
- add images and bootloader instructions
- reformat link list
* convert tabs to spaces in default keymap 
						
						
					 
					
						2021-02-14 23:21:45 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								QMK Bot 
							
						 
					 
					
						
						
							
						
						26ee9360bf 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-15 04:09:53 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Drashna Jaelre 
							
						 
					 
					
						
						
							
						
						e768fb83bd 
					 
					
						
						
							
							[Keyboard] PloopyCo VIA updates ( #11290 )  
						
						 
						
						... 
						
						
						
						Co-authored-by: ridingqwerty <george.g.koenig@gmail.com >
Co-authored-by: Glen D'souza <gdsouza@linuxmail.org > 
						
						
					 
					
						2021-02-14 20:09:24 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joshua Diamond 
							
						 
					 
					
						
						
							
						
						0b63fb5e81 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						 
						
						
						
						
					 
					
						2021-02-14 20:26:22 -05:00