Takeshi ISHII 
							
						 
					 
					
						
						
						
						
							
						
						
							c197d080c4 
							
						 
					 
					
						
						
							
							Update Helix 'led_test' keymap  ( #3292 )  
						
						... 
						
						
						
						* now helix led_test local rgblight.[ch] not use. remove.
* greatly simplify keyboards/helix/rev2/keymaps/led_test/keymap.c
Helix keymap 'led_test' use modified default/keymap.c 
						
						
					 
					
						2018-07-03 16:16:38 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							df73b74b55 
							
						 
					 
					
						
						
							
							Redox Configurator support ( #3290 )  
						
						
						
						
					 
					
						2018-07-03 16:15:58 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							d49e4543b3 
							
						 
					 
					
						
						
							
							Prime_R refactor and Configurator support ( #3289 )  
						
						... 
						
						
						
						* Matrix refactor: rename KEYMAP to LAYOUT
* Keymap refactor: QMK_KEYBOARD_H; new matrix names
* Configurator support 
						
						
					 
					
						2018-07-03 16:15:23 -07:00 
						 
				 
			
				
					
						
							
							
								Daniel Shields 
							
						 
					 
					
						
						
						
						
							
						
						
							a120bbc4de 
							
						 
					 
					
						
						
							
							Add QMK DFU bootloader configuration to planck/dshields keymap. ( #3288 )  
						
						
						
						
					 
					
						2018-07-03 16:14:50 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							3f886a3efe 
							
						 
					 
					
						
						
							
							Play Keyboard 60 refactor and Configurator update ( #3287 )  
						
						... 
						
						
						
						* Matrix refactor
* Keymap refactor
* Configurator update
* Add LAYOUTS = 60_ansi_split_bs_rshift to rules.mk
* Keymap bugfix: deleted two extra commas 
						
						
					 
					
						2018-07-03 16:14:08 -07:00 
						 
				 
			
				
					
						
							
							
								zerovectorspace 
							
						 
					 
					
						
						
						
						
							
						
						
							08c1997db1 
							
						 
					 
					
						
						
							
							Add Dynamic Macro Toggle using Tap Dance keymap to xd75 ( #3297 )  
						
						... 
						
						
						
						* Add Dynamic Macro Toggle using Tap Dance
One Tap    -> Play Macro 1
Two Taps   -> Stop Recording
Three Taps -> Start Recording Macro 1
* Move feature from default to dyn_macro_tap_dance
* Convert 4 space tabs to 2 space tabs
Follows qmk style guidelines 
						
						
					 
					
						2018-07-03 12:13:49 -07:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9c2dde98e2 
							
						 
					 
					
						
						
							
							Merge pull request  #3229  from qmk/hf/shinydox  
						
						... 
						
						
						
						Adds I2C timeout and return values, adds support for future RGB Ergodox EZ 
						
						
					 
					
						2018-07-03 14:06:36 -04:00 
						 
				 
			
				
					
						
							
							
								yiancar 
							
						 
					 
					
						
						
						
						
							
						
						
							a7df902734 
							
						 
					 
					
						
						
							
							Addition of hard brigtness limit for RGB_Matrix ( #3299 )  
						
						... 
						
						
						
						* Addition of hard brigtness limit for RGB_Matrix
- Added a define "RGB_MATRIX_MAXIMUM_BRIGHTNESS" to enable hard limiting the maximum brightness for rgb_matrix
- Used the above define to limit the maximum brigthness of HS60 for better stability
* Added docs for new rgb_matrix define
* Addition of check for maximum brightness 
						
						
					 
					
						2018-07-03 12:52:04 -04:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							dad851d47d 
							
						 
					 
					
						
						
							
							Phantom refactor and Configurator update ( #3285 )  
						
						... 
						
						
						
						* Matrix refactor
* Keymap refactor
* Add iso_uk keymap
* Configurator update
* Add LAYOUTS = tkl_ansi tkl_iso to rules.mk 
						
						
					 
					
						2018-07-01 20:18:50 -07:00 
						 
				 
			
				
					
						
							
							
								Mikkel Jeppesen 
							
						 
					 
					
						
						
						
						
							
						
						
							a3c7f30971 
							
						 
					 
					
						
						
							
							Fixed pin for RGB on lets_split/sockets keyboard ( #3284 )  
						
						
						
						
					 
					
						2018-07-01 20:17:35 -07:00 
						 
				 
			
				
					
						
							
							
								MakotoKurauchi 
							
						 
					 
					
						
						
						
						
							
						
						
							c3d429bcb6 
							
						 
					 
					
						
						
							
							defaulted to 5 rows when HELIX_ROWS is not defined ( #3282 )  
						
						
						
						
					 
					
						2018-07-01 11:09:06 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							90c384f650 
							
						 
					 
					
						
						
							
							Omnikey Blackheart refactor ( #3280 )  
						
						
						
						
					 
					
						2018-07-01 11:08:29 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							47957c3f77 
							
						 
					 
					
						
						
							
							OK60 Refactor and Configurator support ( #3279 )  
						
						... 
						
						
						
						* Matrix refactor
* Keymap refactor
* Configurator support
* Readme formatting fix 
						
						
					 
					
						2018-07-01 11:07:48 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							63b0290708 
							
						 
					 
					
						
						
							
							Nyquist Configurator support and keymap refactor ( #3278 )  
						
						... 
						
						
						
						* Configurator support
* Keymap refactor to QMK_KEYBOARD_H 
						
						
					 
					
						2018-07-01 11:06:57 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							e8d2f4f891 
							
						 
					 
					
						
						
							
							Novelpad refactor and Configurator support ( #3276 )  
						
						... 
						
						
						
						* Matrix refactor
* Keymap refactor
* Configurator support
* Add LAYOUTS = ortho_5x4 to rules.mk
* Readme formatting fix
* #include != #define
* Removed an extra comma 
						
						
					 
					
						2018-07-01 11:06:00 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							29954efd06 
							
						 
					 
					
						
						
							
							Nano refactor and Configurator update ( #3275 )  
						
						... 
						
						
						
						* Matrix refactor
* Keymap refactor
* Configurator support 
						
						
					 
					
						2018-07-01 11:05:10 -07:00 
						 
				 
			
				
					
						
							
							
								marksard 
							
						 
					 
					
						
						
						
						
							
						
						
							738eab0bb1 
							
						 
					 
					
						
						
							
							Helix five rows jis ( #3274 )  
						
						... 
						
						
						
						* Added keymap for Helix like Japanese JIS keyboard.
* * Refactored
* Supported to display of exchange layer 
						
						
					 
					
						2018-07-01 11:04:34 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							0470017c21 
							
						 
					 
					
						
						
							
							Miuni32 refactor and Configurator support ( #3273 )  
						
						... 
						
						
						
						* Matrix refactor
* Keymap refactor
* Configurator support
* Readme formatting update 
						
						
					 
					
						2018-07-01 11:02:26 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							585f753ffe 
							
						 
					 
					
						
						
							
							Mitosis refactor and Configurator support ( #3271 )  
						
						... 
						
						
						
						* Matrix refactor
* Configurator support
* Keymap refactor 
						
						
					 
					
						2018-06-30 19:42:06 -07:00 
						 
				 
			
				
					
						
							
							
								MakotoKurauchi 
							
						 
					 
					
						
						
						
						
							
						
						
							c8e1397e08 
							
						 
					 
					
						
						
							
							Helix fix configrator problem ( #3270 )  
						
						... 
						
						
						
						* Fix problem with configrator
* Edit keyboard info 
						
						
					 
					
						2018-06-30 18:08:52 -07:00 
						 
				 
			
				
					
						
							
							
								omkbd 
							
						 
					 
					
						
						
						
						
							
						
						
							87d9bb461b 
							
						 
					 
					
						
						
							
							ErgoDash Hardware Update ( #3269 )  
						
						... 
						
						
						
						* Hardware update
Backlight enable
Change pin
Add 2keys (68→70)
* change readme
* support rev1
change keymap path
* move ergodash.h 
						
						
					 
					
						2018-06-30 13:13:34 -07:00 
						 
				 
			
				
					
						
							
							
								MakotoKurauchi 
							
						 
					 
					
						
						
						
						
							
						
						
							155375ea32 
							
						 
					 
					
						
						
							
							Helix shrink config ( #3268 )  
						
						... 
						
						
						
						* add some comment about Helix customize and auto-setup RGBLIGHT_LIMIT_VAL
* add define USB_MAX_POWER_CONSUMPTION
* Helix keyboard OLED, RGBLIGHT enable/disable control integrate into rules.mk
rules.mk: add 4 Variables for compile control.
   # Helix keyboard customize
   # you can edit follows 4 Variables
   #  jp: 以下の4つの変数を必要に応じて編集します。
   OLED_ENABLE = no            # OLED_ENABLE
   LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
   LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
   LED_ANIMATIONS = yes        # LED animations
config.h: auto set RGBLED_NUM by HELIX_ROWS and rules.mk's define
* HELIX_ROWS define move from config.h to rules.mk
* add readme.md
* rename readme.md to readme_jp.md
* add readme.md and modify readme_jp.md
* change helix/ssd1306.c for select glcdfont.c position
* add variable LOCAL_GLCDFONT into each keymaps rules.mk
* Add iPhone/iPad LED support to Helix default keymap
* renumber _ADJUST for shrink program size
* Fix Helix i2c wrong bit rate
* add helix serial debug code
* serial debug macro move from config.h to serial.h
* helix serial.c debugging...
* refine debug macros
* add some comments
* add SELECT_SERIAL_SPEED
* add comments
* debugging sync_send/sync_recv
* add very high speed
* fix sync_send/sync_recv
* fix com. start and switch send/recv
* debug mode off
* remove debug codes
* Shrinked config.h 
						
						
					 
					
						2018-06-30 13:12:17 -07:00 
						 
				 
			
				
					
						
							
							
								wanleg 
							
						 
					 
					
						
						
						
						
							
						
						
							dca2c2a439 
							
						 
					 
					
						
						
							
							readme update to wanleg layout ( #3266 )  
						
						
						
						
					 
					
						2018-06-30 06:35:45 -07:00 
						 
				 
			
				
					
						
							
							
								Max Rumpf 
							
						 
					 
					
						
						
						
						
							
						
						
							701fed2e15 
							
						 
					 
					
						
						
							
							Maxr1998's contra layout ( #3267 )  
						
						
						
						
					 
					
						2018-06-30 06:31:26 -07:00 
						 
				 
			
				
					
						
							
							
								Markus Weimar 
							
						 
					 
					
						
						
						
						
							
						
						
							1230ecb73d 
							
						 
					 
					
						
						
							
							Add XD75 keymap ( #3263 )  
						
						
						
						
					 
					
						2018-06-29 15:05:05 -07:00 
						 
				 
			
				
					
						
							
							
								wanleg 
							
						 
					 
					
						
						
						
						
							
						
						
							b79c324642 
							
						 
					 
					
						
						
							
							add QMK DFU make option to gherkin, and bootloader replacement instructions ( #3253 )  
						
						... 
						
						
						
						* add QMK DFU make option, bootloader replacement instructions
in wanleg readme: update flashing instructions, add bootloader replacement instructions (replace default Caterina with QMK DFU).
add make option for QMK DFU
* suggested revisions made
* formatting changes 
						
						
					 
					
						2018-06-29 14:58:38 -07:00 
						 
				 
			
				
					
						
							
							
								Cory Shaw 
							
						 
					 
					
						
						
						
						
							
						
						
							5709e1b602 
							
						 
					 
					
						
						
							
							Fix Mbsurfer deltasplit75 keymap ( #3262 )  
						
						... 
						
						
						
						* Add mbsurfer keymap for DeltaSplit75 with ANSI split backspace
* Update mbsurfer DeltaSplit75 keymap to include right hand arrow cluster
* Update mbsurfer DS75 keymap, move volume down to be symmetrical
* Add readme to Mbsurfer DS75 keymap
* Fix Mbsurfer DS75 keymap image
* Clean up mbsurfer DeltaSplit75 keymap, add layer overview comments
* Fix volume down and add mute to fn layer 
						
						
					 
					
						2018-06-29 08:22:23 -07:00 
						 
				 
			
				
					
						
							
							
								MechMerlin 
							
						 
					 
					
						
						
						
						
							
						
						
							1499dffb07 
							
						 
					 
					
						
						
							
							Support KBD75 rev 2 ( #3261 )  
						
						... 
						
						
						
						* Restructure kbd75 to support multiple revs
* add rev2 files
* fix config comments
* try and avoid duplicate code for LAYOUT macros
* keep the same layouts for rev2 for info.json
* Add QMK Configurator support for the numpad layout
* update readme to talk about rev2 
						
						
					 
					
						2018-06-28 22:44:49 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							b4888eee14 
							
						 
					 
					
						
						
							
							Levinson Configurator support ( #3260 )  
						
						... 
						
						
						
						* Configurator support
* Deleted deprecated KC_LAYOUT_ortho_4x12 matrix alias
* Refactor valgrahf keymap for new matrix name 
						
						
					 
					
						2018-06-28 22:24:23 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							91e8e8d916 
							
						 
					 
					
						
						
							
							Let's Split refactor and Configurator support ( #3259 )  
						
						... 
						
						
						
						* Matrix refactor: deleted KC_LAYOUT_ortho_4x12 alias
* Keymap refactor: bbaserdem_right keymap updated to use new matrix name
* Configurator support 
						
						
					 
					
						2018-06-28 22:23:41 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							e448ef0b1a 
							
						 
					 
					
						
						
							
							Kitten Paw refactor and Configurator update ( #3248 )  
						
						... 
						
						
						
						* Matrix refactor
* Keymap refactor
* Add fullsize_ansi layout to rules.mk
* Configurator support
* Readme cleanup
* Add matrix_init_user and matrix_scan_user functions to kitten_paw.c 
						
						
					 
					
						2018-06-28 12:40:40 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							ded51136ce 
							
						 
					 
					
						
						
							
							Laplace Refactor ( #3252 )  
						
						
						
						
					 
					
						2018-06-28 06:56:14 -07:00 
						 
				 
			
				
					
						
							
							
								MakotoKurauchi 
							
						 
					 
					
						
						
						
						
							
						
						
							1038bbef40 
							
						 
					 
					
						
						
							
							Helix serial bugfix ( #3255 )  
						
						... 
						
						
						
						* add helix serial debug code
* serial debug macro move from config.h to serial.h
* helix serial.c debugging...
* refine debug macros
* add some comments
* add SELECT_SERIAL_SPEED
* add comments
* debugging sync_send/sync_recv
* add very high speed
* fix sync_send/sync_recv
* fix com. start and switch send/recv
* debug mode off
* remove debug codes 
						
						
					 
					
						2018-06-28 06:55:15 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							d80774027e 
							
						 
					 
					
						
						
							
							Knops Configurator update ( #3249 )  
						
						
						
						
					 
					
						2018-06-28 06:53:23 -07:00 
						 
				 
			
				
					
						
							
							
								sgugler 
							
						 
					 
					
						
						
						
						
							
						
						
							f5f0e93230 
							
						 
					 
					
						
						
							
							added a description how to flash jj40 in windows ( #3247 )  
						
						
						
						
					 
					
						2018-06-28 06:52:24 -07:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							7acc781a01 
							
						 
					 
					
						
						
							
							fix backlight key for the light  
						
						
						
						
					 
					
						2018-06-28 08:39:34 -04:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							f1344d1f1e 
							
						 
					 
					
						
						
							
							Kinesis refactor and Configurator update ( #3245 )  
						
						... 
						
						
						
						* Matrix refactor
* Keymap refactor
* Configurator support
* Stapelberg readme formatting fix (missing grave accent) 
						
						
					 
					
						2018-06-27 19:24:08 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							3d831f3550 
							
						 
					 
					
						
						
							
							KBD75 refactor and Configurator update ( #3243 )  
						
						... 
						
						
						
						* Added layout notes to kbd75.h
* info.json cleanup
* Readme cleanup
* Keymap refactor 
						
						
					 
					
						2018-06-27 11:09:00 -07:00 
						 
				 
			
				
					
						
							
							
								Skyler Lewis 
							
						 
					 
					
						
						
						
						
							
						
						
							a8089d7e4b 
							
						 
					 
					
						
						
							
							Minidox familiarized layout ( #3236 )  
						
						... 
						
						
						
						* Create z.txt
* Add files via upload
* Delete config.h
* Delete keymap.c
* Delete rules.mk
* Delete z.txt
* Create x.txt
* Add files via upload
* Delete x.txt
* fixing suggested issues 
						
						
					 
					
						2018-06-27 11:06:29 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							14c2209427 
							
						 
					 
					
						
						
							
							Katana60 refactor and Configurator update ( #3242 )  
						
						... 
						
						
						
						* Matrix refactor
* Configurator support
* Keymap refactor 
						
						
					 
					
						2018-06-27 07:52:00 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							21dbae5d46 
							
						 
					 
					
						
						
							
							JJ50 Refactor and updates ( #3241 )  
						
						... 
						
						
						
						* Matrix Refactor
* Configurator update
* Rules update: add LAYOUTS = ortho_5x12
* Readme update 
						
						
					 
					
						2018-06-27 07:41:50 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							7b2b9b64ec 
							
						 
					 
					
						
						
							
							Fix line endings in keyboards/iris/keymaps/s1carii/config.h ( #3240 )  
						
						
						
						
					 
					
						2018-06-27 07:39:11 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							ac05cdd1f8 
							
						 
					 
					
						
						
							
							JC65 Refactor and Configurator update ( #3239 )  
						
						... 
						
						
						
						* Add Configurator support for JC65 v32a (ps2avrgb) version
* JC65 Keymap refactor 
						
						
					 
					
						2018-06-27 07:38:35 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							e84c07e6f7 
							
						 
					 
					
						
						
							
							Helix: Refactor and Configurator support ( #3238 )  
						
						... 
						
						
						
						* Matrix refactor
* Keymap refactor
* Configurator support 
						
						
					 
					
						2018-06-27 07:37:27 -07:00 
						 
				 
			
				
					
						
							
							
								ishtob 
							
						 
					 
					
						
						
						
						
							
						
						
							482ce08b32 
							
						 
					 
					
						
						
							
							Adding ishtob keymap to master ( #3235 )  
						
						... 
						
						
						
						* Adding my personal planck keymap
* Adding readme.md to my keymap 
						
						
					 
					
						2018-06-26 13:34:01 -07:00 
						 
				 
			
				
					
						
							
							
								rfvizarra 
							
						 
					 
					
						
						
						
						
							
						
						
							73aed698e8 
							
						 
					 
					
						
						
							
							Fixed the command required to build the layout in A persona Orthodox Layout ( #3234 )  
						
						... 
						
						
						
						* Fixed the command to build the layout 
						
						
					 
					
						2018-06-26 13:29:42 -07:00 
						 
				 
			
				
					
						
							
							
								fordmr 
							
						 
					 
					
						
						
						
						
							
						
						
							fc975fc255 
							
						 
					 
					
						
						
							
							New Pok3r Based Keymap ( #3226 )  
						
						... 
						
						
						
						* Create keymap.c
Modified the default to be way more like a pok3r, already clear that it needs a better ctrl location.
* Delete keymap.c
* Create keymap.c
Modified the default keymap to be more like a pok3r, clearly needs a better ctrl location and probably some other tweaks.
* Add files via upload
* Update keymap.c
Parenthesis correction.
* Parenthetical cleanup
Forgot one...
* Mods and numpad; cleanup
Rework mods and numpad layer, remove superfluous declarations
* comment define devlayer
* Create readme.md
Background and intention.
* Updated to fit example
* Update readme.md
* Update rules.mk
* Update config.h
* Updated includes
Replaced: 
#include "iris.h"
#include "action_layer.h"
#include "eeconfig.h"
With:
#include QMK_KEYBOARD_H
* Update rules.mk
Removed RGB enable declarations
* Update rules.mk
* Update keymap.c
Spaced out on MINS and EQL.
* Update rules.mk
Removed unnecessary block.
* Remove the RGB call
Make would fail because of the RGB call that wasn't anywhere but here, cleaned that up from the default config.
* Update keymap.c
Added [ and ] since I'd forgotten them originally... 
						
						
					 
					
						2018-06-25 17:11:14 -07:00 
						 
				 
			
				
					
						
							
							
								Albert Seo 
							
						 
					 
					
						
						
						
						
							
						
						
							52906ad4ba 
							
						 
					 
					
						
						
							
							Added comments to Niu Mini default keymap ( #3230 )  
						
						
						
						
					 
					
						2018-06-25 17:09:47 -07:00 
						 
				 
			
				
					
						
							
							
								noroadsleft 
							
						 
					 
					
						
						
						
						
							
						
						
							ee700b2e83 
							
						 
					 
					
						
						
							
							Configurator fix for Org60 ( #3231 )  
						
						... 
						
						
						
						* Configurator fix
* Added LAYOUTS = 60_ansi to rules.mk 
						
						
					 
					
						2018-06-25 17:09:06 -07:00 
						 
				 
			
				
					
						
							
							
								MechMerlin 
							
						 
					 
					
						
						
						
						
							
						
						
							2f8f26b1e0 
							
						 
					 
					
						
						
							
							Add QMK Configurator Support for ORG60 ( #3228 )  
						
						... 
						
						
						
						* Add additional readme notes on how to fix the flickering backlight issue
* Add QMK Configurator support 
						
						
					 
					
						2018-06-25 08:11:29 -07:00