Sandro Santilli 
								
							 
						 
						
							
							
							
							
								
							
							
								80eea77953 
								
							 
						 
						
							
							
								
								Use MixedCase constant names  
							
							 
							
							... 
							
							
							
							See https://github.com/golang/go/wiki/CodeReviewComments#mixed-caps  
							
						 
						
							2016-11-07 17:05:08 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Boerger 
								
							 
						 
						
							
							
							
							
								
							
							
								5d430c9e68 
								
							 
						 
						
							
							
								
								Merge pull request  #108  from go-gitea/go-sdk  
							
							 
							
							... 
							
							
							
							Replaced gogits go-gogs-client with go-sdk 
							
						 
						
							2016-11-07 16:31:17 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Boerger 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4c6c16f358 
								
							 
						 
						
							
							
								
								Replaced go-gogs-client with go-sdk imports  
							
							 
							
							
							
						 
						
							2016-11-07 16:10:32 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Boerger 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77f9c7e571 
								
							 
						 
						
							
							
								
								Fixed links to sdk docs  
							
							 
							
							
							
						 
						
							2016-11-07 16:10:32 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sandro Santilli 
								
							 
						 
						
							
							
							
							
								
							
							
								b7263f31a5 
								
							 
						 
						
							
							
								
								Replace GOGS with GITEA in variable names  
							
							 
							
							... 
							
							
							
							Still use GOGS_WORK_DIR and GOGS_CUSTOM env variables
as a fallback if the equivalent GITEA_* are not set,
warning user about the need for change.
Does not change "gogs" to "gitea" in webhook type name
Because "gogs" hook type is part of the API (routes) and used
in templates...
Closes  #87  
							
						 
						
							2016-11-07 16:05:18 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rachid Zarouali 
								
							 
						 
						
							
							
							
							
								
							
							
								be5607e510 
								
							 
						 
						
							
							
								
								Merge pull request  #50  from 0xbaadf00d/feature/2583-disablehttpcloning  
							
							 
							
							... 
							
							
							
							Disable HTTP cloning 
							
						 
						
							2016-11-07 11:23:30 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Odin Ugedal 
								
							 
						 
						
							
							
							
							
								
							
							
								5a6f7edde9 
								
							 
						 
						
							
							
								
								Use the rev-parsed sha1 commit id ( #98 )  
							
							 
							
							... 
							
							
							
							Use the rev-parsed sha1 commit id in urls to repo files,
instead of the abbreviated version. 
							
						 
						
							2016-11-06 19:15:44 -02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Odin Ugedal 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								530f6c1da4 
								
							 
						 
						
							
							
								
								Fix rendering of non-markdown readme files  
							
							 
							
							
							
						 
						
							2016-11-06 16:02:42 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sandro Santilli 
								
							 
						 
						
							
							
							
							
								
							
							
								6e4252dad4 
								
							 
						 
						
							
							
								
								Replace gogits/git-module dependency with go-gitea/git ( #94 )  
							
							 
							
							... 
							
							
							
							* Replace gogits/git-module dependency with go-gitea/git
Fixes  #92 
* Remove git alias for git module import (not needed) 
							
						 
						
							2016-11-06 11:18:34 -02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sandro Santilli 
								
							 
						 
						
							
							
							
							
								
							
							
								f36544f98d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into feature/goimports  
							
							 
							
							
							
						 
						
							2016-11-05 22:54:20 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Andrey Nering 
								
							 
						 
						
							
							
							
							
								
							
							
								bd898a10f8 
								
							 
						 
						
							
							
								
								Refactor editorconfig middleware  
							
							 
							
							
							
						 
						
							2016-11-05 15:44:14 -02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Matthias Loibl 
								
							 
						 
						
							
							
							
							
								
							
							
								1f44b01e2a 
								
							 
						 
						
							
							
								
								Fix imports found by goimports.  
							
							 
							
							
							
						 
						
							2016-11-05 17:56:35 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Andrey Nering 
								
							 
						 
						
							
							
							
							
								
							
							
								984fa8d83b 
								
							 
						 
						
							
							
								
								Fix 500 when repo has invalid .editorconfig  
							
							 
							
							... 
							
							
							
							Creating a notice instead 
							
						 
						
							2016-11-05 13:33:41 -02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Boerger 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e05a5ca36c 
								
							 
						 
						
							
							
								
								Executed go fmt for all files  
							
							 
							
							
							
						 
						
							2016-11-04 23:45:06 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rémy Boulanouar 
								
							 
						 
						
							
							
							
							
								
							
							
								8dc49dc114 
								
							 
						 
						
							
							
								
								Implementation of the feature to redirect to an external issue tracker  
							
							 
							
							
							
						 
						
							2016-11-04 09:06:54 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Andrey Nering 
								
							 
						 
						
							
							
							
							
								
							
							
								87b593f93e 
								
							 
						 
						
							
							
								
								Show issue/PR number on title  
							
							 
							
							
							
						 
						
							2016-11-03 20:28:05 -02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rémy Boulanouar 
								
							 
						 
						
							
							
							
							
								
							
							
								2d68bd1ef9 
								
							 
						 
						
							
							
								
								Change import reference to match gitea instead of gogs ( #37 )  
							
							 
							
							
							
						 
						
							2016-11-03 10:29:56 -02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibault Meyer 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								93f1eabe30 
								
							 
						 
						
							
							
								
								rename variable + fix wiki link  
							
							 
							
							
							
						 
						
							2016-10-04 18:58:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibault Meyer 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9d66497abc 
								
							 
						 
						
							
							
								
								Can disable GIT interactions by HTTP protocol  
							
							 
							
							
							
						 
						
							2016-09-18 10:54:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								dadd35b636 
								
							 
						 
						
							
							
								
								#3559  fix template error  
							
							 
							
							
							
						 
						
							2016-08-31 13:59:23 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									无闻 
								
							 
						 
						
							
							
							
							
								
							
							
								cd9b926af7 
								
							 
						 
						
							
							
								
								Support Editorconfig on web editor ( #3512 )  
							
							 
							
							
							
						 
						
							2016-08-30 16:47:22 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Andrey Nering 
								
							 
						 
						
							
							
							
							
								
							
							
								9ac46fb983 
								
							 
						 
						
							
							
								
								Support Editorconfig on web editor  
							
							 
							
							
							
						 
						
							2016-08-30 20:30:47 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								8516dfcb6c 
								
							 
						 
						
							
							
								
								#2018  able to sync now for mirrors  
							
							 
							
							... 
							
							
							
							- Refactor code to use sync.UniqueQueue
- Closes  #3509  
							
						 
						
							2016-08-30 16:18:33 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								643142acab 
								
							 
						 
						
							
							
								
								Web editor: support upload files  
							
							 
							
							
							
						 
						
							2016-08-30 05:23:59 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								780cc2d110 
								
							 
						 
						
							
							
								
								router/repo: code refactoring  
							
							 
							
							
							
						 
						
							2016-08-30 02:08:38 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								28cf0e6aaa 
								
							 
						 
						
							
							
								
								#3459  code quality improvement  
							
							 
							
							
							
						 
						
							2016-08-29 20:00:06 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibault Meyer 
								
							 
						 
						
							
							
							
							
								
							
							
								92fb30c526 
								
							 
						 
						
							
							
								
								Load a set of predefined labels ( #3459 )  
							
							 
							
							... 
							
							
							
							* Can use a predefined set of labels
* Change UI
* Fix HTML file indentation
* Avoid reading file from other directory (security issue)
* Apply a better fix
* Remove not used variable
* Merge upstream/develop
* Do modifications
* Raname
* remove binding + rename variable 
							
						 
						
							2016-08-29 19:02:49 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								62b0dc4853 
								
							 
						 
						
							
							
								
								Web editor: fix cannot create new file in subdirectory  
							
							 
							
							
							
						 
						
							2016-08-29 00:10:21 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								429c92c0ce 
								
							 
						 
						
							
							
								
								#3516  enforce line ending to be \n from web editor  
							
							 
							
							
							
						 
						
							2016-08-28 05:32:10 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								ba27d71abe 
								
							 
						 
						
							
							
								
								Web editor: improve edit file  
							
							 
							
							
							
						 
						
							2016-08-28 04:31:42 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								0114fdcba4 
								
							 
						 
						
							
							
								
								Web editor: improve delete file process  
							
							 
							
							
							
						 
						
							2016-08-28 01:41:44 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								6e171c5225 
								
							 
						 
						
							
							
								
								Web editor: improve edit file tooltip  
							
							 
							
							
							
						 
						
							2016-08-27 15:25:01 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								6b98d58906 
								
							 
						 
						
							
							
								
								#2966  code cleanup  
							
							 
							
							
							
						 
						
							2016-08-26 13:40:53 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								f8a48ffaad 
								
							 
						 
						
							
							
								
								Web editor: improve code quality  
							
							 
							
							
							
						 
						
							2016-08-24 21:35:03 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								0b273ac4d5 
								
							 
						 
						
							
							
								
								#3383  code cleanup  
							
							 
							
							
							
						 
						
							2016-08-24 16:05:56 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								a00c932bbc 
								
							 
						 
						
							
							
								
								General code quality improvement  
							
							 
							
							
							
						 
						
							2016-08-16 23:06:38 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								6f9a95f830 
								
							 
						 
						
							
							
								
								#2246  add HTMLURL to webhook type  
							
							 
							
							... 
							
							
							
							- Fill Milestone and Assignee field when available in webhook payload 
							
						 
						
							2016-08-16 10:19:09 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								6cda35a75f 
								
							 
						 
						
							
							
								
								#3464  reproduce diff signs  
							
							 
							
							
							
						 
						
							2016-08-16 07:31:54 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								2625193a48 
								
							 
						 
						
							
							
								
								models/repo_editor: improve code quality  
							
							 
							
							
							
						 
						
							2016-08-15 22:20:55 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								4042d1f0c3 
								
							 
						 
						
							
							
								
								models/issue: improve quality and performance of NewIssue function  
							
							 
							
							
							
						 
						
							2016-08-15 18:40:32 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								4a46613916 
								
							 
						 
						
							
							
								
								markdown: fix treating pure number as SHA1  
							
							 
							
							... 
							
							
							
							- Detect non-exist commit and return 404 not 500 
							
						 
						
							2016-08-15 15:27:19 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								61e27dedf7 
								
							 
						 
						
							
							
								
								#3466  fix response of pull request form validation error  
							
							 
							
							
							
						 
						
							2016-08-15 14:04:44 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								94392a7af3 
								
							 
						 
						
							
							
								
								Fix empty repository panic on send test webhook  
							
							 
							
							
							
						 
						
							2016-08-15 05:53:47 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								8637e67e6f 
								
							 
						 
						
							
							
								
								Fix outdated edit can’t overwrite changes  
							
							 
							
							
							
						 
						
							2016-08-15 02:06:35 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								4a19fd6441 
								
							 
						 
						
							
							
								
								Web editor: temporarily disable upload and quick fix for edit and new  
							
							 
							
							... 
							
							
							
							Try to merge into develop branch ASAP, then continue minor fixes afterwards. 
							
						 
						
							2016-08-15 01:42:20 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								54e0ada9d5 
								
							 
						 
						
							
							
								
								Web editor: improve delete file  
							
							 
							
							
							
						 
						
							2016-08-14 23:52:24 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								cd89f6c502 
								
							 
						 
						
							
							
								
								Web editor: improve edit file and diff preview  
							
							 
							
							
							
						 
						
							2016-08-14 23:52:24 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								15845cb287 
								
							 
						 
						
							
							
								
								Code clean up for new config options  
							
							 
							
							
							
						 
						
							2016-08-14 23:52:24 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Richard Mahn 
								
							 
						 
						
							
							
							
							
								
							
							
								d0a0239bac 
								
							 
						 
						
							
							
								
								Squashed commit of the following:  
							
							 
							
							... 
							
							
							
							commit 0afcb843d7ffd596991c4885cab768273a6eb42c
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 17:13:29 2016 -0600
    Removed Upload stats as the upload table is just a temporary table
commit 7ecd73ff5535612d79d471409173ee7f1fcfa157
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:42:41 2016 -0600
    Fix for CodeMirror mode
commit c29b9ab531e2e7af0fb5db24dc17e51027dd1174
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:03:33 2016 -0600
    Made tabbing in editor use spaces
commit 23af384c53206a8a40e11e45bf49d7a149c4adcd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:56:46 2016 -0600
    Fix for data-url
commit cfb8a97591cb6fc0a92e49563b7b764c524db0e9
Merge: 7fc8a89 991ce42 
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:42:53 2016 -0600
    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file
    Conflicts:
    	modules/bindata/bindata.go
    	public/js/gogs.js
commit 7fc8a89cb495478225b02d613e647f99a1489634
Merge: fd3d86c c03d040
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:40:00 2016 -0600
    Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file
commit fd3d86ca6bbc02cfda566a504ffd6b03db4f75ef
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:39:44 2016 -0600
    Code cleanup
commit c03d0401c1049eeeccc32ab1f9c3303c130be5ee
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 29 15:38:23 2016 -0600
    Code cleanup
commit 98e1206ccf9f9a4503c020e3a7830cf9f861dfae
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 18:36:01 2016 -0600
    Code cleanup and fixes
commit c2895dc742f25f8412879c9fa15e18f27f42f194
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 18:24:04 2016 -0600
    Fixes per Unknwon's requests
commit 6aa7e46b21ad4c96e562daa2eac26a8fb408f8ef
Merge: 889e9fa ad7ea88 
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 17:13:43 2016 -0600
    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file
    Conflicts:
    	modules/bindata/bindata.go
    	modules/setting/setting.go
commit 889e9faf1bd8559a4979c8f46005d488c1a234d4
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:09:18 2016 -0600
    Fix in gogs.js
commit 47603edf223f147b114be65f3bd27bc1e88827a5
Merge: bb57912 cf85e9e 
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:07:36 2016 -0600
    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file
    Conflicts:
    	modules/bindata/bindata.go
    	public/js/gogs.js
commit bb5791255867a71c11a77b639db050ad09c597a4
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:02:18 2016 -0600
    Update for using CodeMirror mode addon
commit d10d128c51039be19e2af9c66c63db66a9f2ec6d
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Tue Jul 19 16:12:57 2016 -0600
    Update for Edit
commit 34a34982025144e3225e389f7849eb6273c1d576
Merge: fa1b752 1c7dcdd 
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Tue Jul 19 11:52:02 2016 -0600
    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file
    Conflicts:
    	modules/bindata/bindata.go
commit fa1b752be29cd455c5184ddac2ffe80b3489763e
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 15 18:35:42 2016 -0600
    Feature for editing, creating, uploading and deleting files 
							
						 
						
							2016-08-14 23:52:24 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Unknwon 
								
							 
						 
						
							
							
							
							
								
							
							
								dccb0c15b9 
								
							 
						 
						
							
							
								
								Replace convert.To with APIFormat calls  
							
							 
							
							
							
						 
						
							2016-08-14 04:17:26 -07:00