Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							43785126a7 
							
						 
					 
					
						
						
							
							Merge pull request  #8710  from vomindoraan/keymap_extras_fixup  
						
						
						
						
							
 
						
					 
					
						2020-04-19 19:18:05 +10:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8c97b4a3a4 
							
						 
					 
					
						
						
							
							Add a syllabus to guide people who are learning QMK ( #8816 )  
						
						
						
						
							
 
						
					 
					
						2020-04-19 09:08:38 +02:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0698b15aa5 
							
						 
					 
					
						
						
							
							Update cli CI checkout to v2 ( #8823 )  
						
						
						
						
							
						
					 
					
						2020-04-19 09:08:12 +02:00 
						 
				 
			
				
					
						
							
							
								Jonathan Rascher 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d600631ad1 
							
						 
					 
					
						
						
							
							[Keymap] Rework my Tsangan layout; turn off mousekeys ( #8836 )  
						
						... 
						
						
						
						* Give Tsangan layout a real Fn2 layer
* Disable mouse keys to work around qmk#8323
I don't actually use this feature, so there's no reason for it to be
enabled anyway, and it seems to cause spurious wakeups on Windows. 
						
						
							
						
					 
					
						2020-04-18 18:41:40 -07:00 
						 
				 
			
				
					
						
							
							
								Josh Hinnebusch 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f3595f65b7 
							
						 
					 
					
						
						
							
							[Keyboard] add dual-direction diode capability for hbcp ( #8795 )  
						
						... 
						
						
						
						* add dual-direction diode capability
* update per PR requests
Co-authored-by: hineybush <hineybushkeyboards@gmail.com> 
						
						
							
						
					 
					
						2020-04-18 18:06:28 -07:00 
						 
				 
			
				
					
						
							
							
								mechanicalguy21 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							23df763a31 
							
						 
					 
					
						
						
							
							[Keyboard] Adding Novem keyboard (macropad) and demo layout ( #8781 )  
						
						... 
						
						
						
						* Adding Novem keyboard (macropad) and demo layout
* Making changes suggested during pull request
* Removing keyboards/novem/keymaps/default/config.h as suggested during the pull request
* Moving keyboard to the handwired folder and changing the build line from readme in order to reflect this new location 
						
						
							
						
					 
					
						2020-04-18 17:58:58 -07:00 
						 
				 
			
				
					
						
							
							
								Konstantin Đorđević 
							
						 
					 
					
						
						
						
						
							
						
						
							ed910c8e97 
							
						 
					 
					
						
						
							
							Add back deprecated SE_AE keycode  
						
						
						
						
							
						
					 
					
						2020-04-19 02:56:52 +02:00 
						 
				 
			
				
					
						
							
							
								Cody Bender 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7e1c0bd4c0 
							
						 
					 
					
						
						
							
							[Keyboard] Add Absinthe keyboard ( #8769 )  
						
						... 
						
						
						
						* Initial absinthe setup
* Update Absinthe files
* Add absinthe ANSI layout
* Update absinthe keymaps
* Update Absinthe for rev3
* Flip encoder pins
* Fix rules.mk
* Update absinthe files
* Fix absinthe ansi config
* Add RGB
* Change rules for absinthe for firmware size
* Fix pins for rev4
* Fix pins and GESC
* Remove GESC from ANSI layout
* Rebase upstream/master
* Update formatting and convention from 8769 feedback
* Format rules.mk 
						
						
							
						
					 
					
						2020-04-18 17:40:13 -07:00 
						 
				 
			
				
					
						
							
							
								Spaceman 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d2b8398f75 
							
						 
					 
					
						
						
							
							[Keyboard] Add DGG-56 Handwired ( #8740 )  
						
						... 
						
						
						
						* Add ddg_56 keyboard
* Add ddg_56 default keymap
* Fix config.h
* Update config.h
* Update ddg_56.h
* Update keyboards/handwired/ddg_56/readme.md
Co-Authored-By: Ryan <fauxpark@gmail.com>
* Update keyboards/handwired/ddg_56/readme.md
Co-Authored-By: Ryan <fauxpark@gmail.com>
* Update keyboards/handwired/ddg_56/info.json
Co-Authored-By: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com> 
						
						
							
						
					 
					
						2020-04-18 17:20:42 -07:00 
						 
				 
			
				
					
						
							
							
								joseandres42 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							195324cc4c 
							
						 
					 
					
						
						
							
							Add dvorak's spanish variant to quantum/keymap_extras ( #8732 )  
						
						... 
						
						
						
						* Added dvorak's spanish variant.
* Fixed spacing
* Fixed filename typo
* Applied fixes and suggestions.
* Fixed spacing
* Added sendstring_spanish_dvorak.h
* Fixed sendstring_spanish.h
* Update quantum/keymap_extras/sendstring_spanish_dvorak.h
Co-Authored-By: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/sendstring_spanish.h
Co-Authored-By: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/sendstring_spanish_dvorak.h
Co-Authored-By: Ryan <fauxpark@gmail.com>
Co-authored-by: joseandres42 <joseandres42@Orion-PC.localdomain>
Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2020-04-18 17:12:36 -07:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cd5399942b 
							
						 
					 
					
						
						
							
							Merge pull request  #8722  from fauxpark/keymap-extras-bepo  
						
						
						
						
							
 
 
 
 
						
					 
					
						2020-04-19 06:58:01 +10:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fd4bbd8d11 
							
						 
					 
					
						
						
							
							Update Italian macOS keymaps and add sendstring LUTs ( #8701 )  
						
						... 
						
						
						
						* Update Italian macOS keymaps and add sendstring LUTs
* Wrong letter 
						
						
							
						
					 
					
						2020-04-19 06:57:36 +10:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f43cb31476 
							
						 
					 
					
						
						
							
							Update French and German macOS keymaps and add sendstring LUTs ( #8700 )  
						
						
						
						
							
						
					 
					
						2020-04-19 06:57:05 +10:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							89eb3a9e42 
							
						 
					 
					
						
						
							
							Update Swiss French/German keymaps and add sendstring LUTs ( #8689 )  
						
						
						
						
							
						
					 
					
						2020-04-19 06:56:49 +10:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							66d94dc22a 
							
						 
					 
					
						
						
							
							Move everything to Python 3.6 ( #8835 )  
						
						
						
						
							
 
						
					 
					
						2020-04-18 22:00:56 +02:00 
						 
				 
			
				
					
						
							
							
								MechMerlin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5a8f59503e 
							
						 
					 
					
						
						
							
							VIA Support: All QMK Winkeyless.kr boards ( #8846 )  
						
						
						
						
							
						
					 
					
						2020-04-18 21:45:24 +02:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7918f7d61d 
							
						 
					 
					
						
						
							
							Document the Proton C pins for manual Pro Micro conversion ( #7043 )  
						
						
						
						
							
						
					 
					
						2020-04-18 10:58:59 -07:00 
						 
				 
			
				
					
						
							
							
								buzzlighter1 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a6bd8fe67b 
							
						 
					 
					
						
						
							
							Update keyboards/xd75/keymaps/buzzlighter1/readme.md  
						
						... 
						
						
						
						Co-Authored-By: Joel Challis <git@zvecr.com> 
						
						
							
						
					 
					
						2020-04-18 20:32:24 +03:00 
						 
				 
			
				
					
						
							
							
								worldspawn00 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							55b43f02f0 
							
						 
					 
					
						
						
							
							fixing Walletburner Neuron layout for configurator ( #8839 )  
						
						... 
						
						
						
						* fixing layout for configurator
adding missing bottom row key to resolve formatting 
						
						
							
						
					 
					
						2020-04-18 10:27:47 -07:00 
						 
				 
			
				
					
						
							
							
								buzzlighter1 
							
						 
					 
					
						
						
						
						
							
						
						
							db4b11f866 
							
						 
					 
					
						
						
							
							A few final edits to the keymap and readme.  
						
						
						
						
							
						
					 
					
						2020-04-18 18:16:11 +03:00 
						 
				 
			
				
					
						
							
							
								Erovia 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							46a84ec84a 
							
						 
					 
					
						
						
							
							Load keymap-level rules.mk when compiling keymap.json ( #8841 )  
						
						
						
						
							
 
						
					 
					
						2020-04-18 14:29:48 +01:00 
						 
				 
			
				
					
						
							
							
								James Young 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3b5998085c 
							
						 
					 
					
						
						
							
							Add info.json for bat43 ( #8824 )  
						
						
						
						
							
						
					 
					
						2020-04-17 19:26:04 +01:00 
						 
				 
			
				
					
						
							
							
								Andrew Kannan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7a9980fd85 
							
						 
					 
					
						
						
							
							Apply suggestions from code review  
						
						... 
						
						
						
						Co-Authored-By: Ryan <fauxpark@gmail.com>
Co-Authored-By: Joel Challis <git@zvecr.com> 
						
						
							
						
					 
					
						2020-04-17 11:04:25 -04:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bc13dcd349 
							
						 
					 
					
						
						
							
							Remove Atmel FLIP from install scripts and documentation ( #8822 )  
						
						
						
						
							
 
						
					 
					
						2020-04-17 09:50:58 +02:00 
						 
				 
			
				
					
						
							
							
								moyi4681 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							55002338b1 
							
						 
					 
					
						
						
							
							add kbd67 rev2 via support, kbd67mkiirgb small change ( #8810 )  
						
						... 
						
						
						
						* add kbd67 rev2 via support, kbd67mkiirgb small change
add kbd67 rev2 via support, kbd67mkiirgb small change
* Update keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c
* Update keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c
* define DYNAMIC_KEYMAP_LAYER_COUNT 2 
						
						
							
						
					 
					
						2020-04-16 17:41:56 -07:00 
						 
				 
			
				
					
						
							
							
								Andrew Kannan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							99d9250045 
							
						 
					 
					
						
						
							
							Apply suggestions from code review  
						
						... 
						
						
						
						Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2020-04-16 16:20:43 -04:00 
						 
				 
			
				
					
						
							
							
								MechMerlin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4a92dd327c 
							
						 
					 
					
						
						
							
							[Keyboard] Botanical Keyboards FM2U  ( #8819 )  
						
						... 
						
						
						
						* initial commit for fm2u keyboard
* add fm2u keyboard along with VIA keymap
* add meme LAYOUT support
* minor cleanups
* fixup layout macro names 
						
						
							
						
					 
					
						2020-04-16 12:28:49 -07:00 
						 
				 
			
				
					
						
							
							
								Mikkel Jeppesen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7873b49d40 
							
						 
					 
					
						
						
							
							Keeb.werk nano.slider Improved Default Layout ( #8785 )  
						
						... 
						
						
						
						* Improved default layout to match improved layout from configurator PR
* fixed keycode spacing
* Update keyboards/keebwerk/nano_slider/keymaps/default/keymap.c 
						
						
							
						
					 
					
						2020-04-16 12:04:27 -07:00 
						 
				 
			
				
					
						
							
							
								stanrc85 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fcf2b45263 
							
						 
					 
					
						
						
							
							Update stanrc85 rules for alice/rev1 ( #8821 )  
						
						
						
						
							
						
					 
					
						2020-04-16 16:57:32 +01:00 
						 
				 
			
				
					
						
							
							
								umi 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5607af8524 
							
						 
					 
					
						
						
							
							[Docs] Japanese translation of docs/feature_combo.md ( #8671 )  
						
						... 
						
						
						
						* add feature_combo.md translation
* change tiny word
* update based on comment
* update based on comment 
						
						
							
						
					 
					
						2020-04-15 22:08:00 -04:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5a45627e17 
							
						 
					 
					
						
						
							
							Remove old setup scripts ( #8811 )  
						
						
						
						
							
 
						
					 
					
						2020-04-16 00:32:40 +01:00 
						 
				 
			
				
					
						
							
							
								Andrew Kannan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							17d0f6338e 
							
						 
					 
					
						
						
							
							[Keyboard] ProjectKB Alice rev2 ( #8718 )  
						
						... 
						
						
						
						* Add revision 1 and revision 2 to ProjectKB Alice PCB
* Swap SLEEP LED to no
* Basic root rules.mk
* Apply suggestions from code review
* Update keyboards/projectkb/alice/rules.mk 
						
						
							
						
					 
					
						2020-04-15 15:37:47 -07:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							484c059d86 
							
						 
					 
					
						
						
							
							MILC: Fix setting config values for store_true and store_false ( #8813 )  
						
						
						
						
							
 
						
					 
					
						2020-04-15 22:49:22 +02:00 
						 
				 
			
				
					
						
							
							
								James Young 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3cc68543ca 
							
						 
					 
					
						
						
							
							KC60 Refactor ( #8782 )  
						
						
						
						
							
						
					 
					
						2020-04-15 22:31:09 +02:00 
						 
				 
			
				
					
						
							
							
								MakotoKurauchi 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							daf6dedb02 
							
						 
					 
					
						
						
							
							Fix quick7 build command ( #8812 )  
						
						
						
						
							
						
					 
					
						2020-04-16 03:35:42 +10:00 
						 
				 
			
				
					
						
							
							
								Andrew Kannan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7a0d145e27 
							
						 
					 
					
						
						
							
							Whitespace changes  
						
						... 
						
						
						
						Co-Authored-By: Ryan <fauxpark@gmail.com> 
						
						
							
						
					 
					
						2020-04-15 12:35:24 -04:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e990863296 
							
						 
					 
					
						
						
							
							Miscellaneous stuff: remove clang-complete and autocomplete.sh, fix some rules.mk comments ( #8784 )  
						
						
						
						
							
 
						
					 
					
						2020-04-15 02:03:49 -07:00 
						 
				 
			
				
					
						
							
							
								Daniel Klein 
							
						 
					 
					
						
						
						
						
							
						
						
							d06340f665 
							
						 
					 
					
						
						
							
							uni660rev2 added  
						
						
						
						
							
						
					 
					
						2020-04-14 21:25:25 -07:00 
						 
				 
			
				
					
						
							
							
								Andrew Kannan 
							
						 
					 
					
						
						
						
						
							
						
						
							4c0065dda7 
							
						 
					 
					
						
						
							
							Add new obliterated75 files  
						
						
						
						
							
						
					 
					
						2020-04-15 00:04:03 -04:00 
						 
				 
			
				
					
						
							
							
								MakotoKurauchi 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2ae39ccf38 
							
						 
					 
					
						
						
							
							[Keyboard] add new keyboard quick7 ( #8670 )  
						
						... 
						
						
						
						* add new keyboard quick7
* Update keyboards/yushakobo/quick7/keymaps/default/keymap.c
* Update keyboards/yushakobo/quick7/quick7.c
* Update keyboards/yushakobo/quick7/rules.mk
* Update keyboards/yushakobo/quick7/keymaps/default/keymap.c
* Update keyboards/yushakobo/quick7/readme.md
* Update keyboards/yushakobo/quick7/rules.mk
* Update keyboards/yushakobo/quick7/rules.mk
* Deleted unnecessary file.
* Comment added.
* Update keyboards/yushakobo/quick7/config.h
* Update keyboards/yushakobo/quick7/readme.md
* Update keyboards/yushakobo/quick7/keymaps/default/keymap.c
* Update keyboards/yushakobo/quick7/config.h 
						
						
							
						
					 
					
						2020-04-14 18:45:14 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Scatena 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5185c52b4a 
							
						 
					 
					
						
						
							
							[Keymap] Added custom layout for KBDFans KBD67 rev2 ( #8752 )  
						
						... 
						
						
						
						* added v1 of keyboard layout
* Update keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c
* Update keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c
* Update keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c
* Update keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c
* Update keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c
* Delete config.h 
						
						
							
						
					 
					
						2020-04-14 18:38:48 -07:00 
						 
				 
			
				
					
						
							
							
								x1 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c0b99badcb 
							
						 
					 
					
						
						
							
							[keyboard] Add kudox rev3 ( #8704 )  
						
						... 
						
						
						
						* Add kudox rev3.
* Add default keymap for Kudox rev3.
* Add JIS keymap for Kudox rev3.
* Modified default revision of kudox rev3.
* Modified unnecessary codes. 
						
						
							
						
					 
					
						2020-04-14 18:24:56 -07:00 
						 
				 
			
				
					
						
							
							
								Pete Johanson 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f9bb9ef0b8 
							
						 
					 
					
						
						
							
							CLI: Fix doctor error when can't run bin/qmk --version. ( #8796 )  
						
						
						
						
							
 
 
						
					 
					
						2020-04-14 16:58:00 +02:00 
						 
				 
			
				
					
						
							
							
								Øyvind Wilhelmsen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3d9ffd3efb 
							
						 
					 
					
						
						
							
							deleted unused keymap ( #8797 )  
						
						
						
						
							
						
					 
					
						2020-04-14 12:09:33 +01:00 
						 
				 
			
				
					
						
							
							
								mimkorn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3cea9fedff 
							
						 
					 
					
						
						
							
							Add missing repository name to qmk setup w/ github ( #8792 )  
						
						... 
						
						
						
						Using just qmk setup <github_username> would fail w/ "Could not find repo github.com/<username>, whereas the repo is actually after another slash after the user name. Can consider changing code to add the default forked repo name if slash is not detected in the arg. 
						
						
							
						
					 
					
						2020-04-14 21:03:13 +10:00 
						 
				 
			
				
					
						
							
							
								eucalyn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							575d99816e 
							
						 
					 
					
						
						
							
							Configure RGBLIGHT_SPLIT for Mint60 ( #8788 )  
						
						
						
						
							
						
					 
					
						2020-04-13 23:40:15 +01:00 
						 
				 
			
				
					
						
							
							
								Aplyard 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4bccde37d4 
							
						 
					 
					
						
						
							
							[Keyboard] Aplx6 ( #8727 )  
						
						... 
						
						
						
						* Create test.txt
* aplx6
* Delete test.txt
* fff
* Delete ffff
* test compile
* Create README.md
* edited
* requests
* Update keyboards/aplx6/README.md
* Update keyboards/aplx6/README.md
* Update keyboards/aplx6/README.md
* Update keyboards/aplx6/README.md
* Update keyboards/aplx6/README.md
* Update keyboards/aplx6/README.md
* Update keyboards/aplx6/README.md
* Update keyboards/aplx6/rules.mk
* Update keyboards/aplx6/rules.mk
* Update keyboards/aplx6/README.md
* Update keyboards/aplx6/README.md
* Update keyboards/aplx6/README.md
* pins update
* update
* update pins
* Update keyboards/aplx6/README.md
* Update keyboards/aplx6/README.md 
						
						
							
						
					 
					
						2020-04-13 12:13:41 -07:00 
						 
				 
			
				
					
						
							
							
								Pavlos Vinieratos 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f6b40da7f8 
							
						 
					 
					
						
						
							
							update pvinis keymap ( #8746 )  
						
						... 
						
						
						
						* update a bunch of stuff
Better rules, better config, added encoders, lights, audio.
* some fmt
* more fmt 
						
						
							
						
					 
					
						2020-04-13 11:59:04 -07:00 
						 
				 
			
				
					
						
							
							
								Pete Johanson 
							
						 
					 
					
						
						
						
						
							
						
						
							6fb048fdaf 
							
						 
					 
					
						
						
							
							CLI: Use shutil.which to detect gmake, instead of OS check.  
						
						
						
						
							
 
						
					 
					
						2020-04-13 10:48:27 -07:00 
						 
				 
			
				
					
						
							
							
								Pete Johanson 
							
						 
					 
					
						
						
						
						
							
						
						
							06b571aa53 
							
						 
					 
					
						
						
							
							CLI: Invoke gmake on FreeBSD when using qmk compile.  
						
						... 
						
						
						
						* Current makefiles aren't portable, so invoke gmake on FreeBSD. 
						
						
							
						
					 
					
						2020-04-13 10:48:27 -07:00