6543 
								
							 
						 
						
							
							
								
							
							
	
	
	1cd301796c 
 
						 
						
							
							
								
								
								Only log Error on getLastCommitStatus error to let pull list still be visible ( #15716 )  
							
							
							
							
						 
						
							2021-05-04 14:03:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									GiteaBot 
								
							 
						 
						
							
							
								
							
							
	ed39377900  
						 
						
							
							
								
								
								[skip ci] Updated translations via Crowdin  
							
							
							
							
						 
						
							2021-05-04 00:12:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan Tran 
								
							 
						 
						
							
							
								
							
							
	
	
	5e047b9bd7 
 
						 
						
							
							
								
								
								Add compare tag dropdown to releases page ( #15695 )  
							
							... 
							
							
							
							
							* Add compare tag dropdown to releases page
* Change defaults to be more intuitive and remove unneeded option
* Fix to select branch on releases page
Co-authored-by: Jonathan Tran <jon@allspice.io>
Co-authored-by: Kyle D <kdumontnu@gmail.com> 
							
						 
						
							2021-05-03 13:27:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zeripath 
								
							 
						 
						
							
							
								
							
							
	
	
	1b017fe7ca 
 
						 
						
							
							
								
								
								Fix setting redis db path ( #15698 )  
							
							... 
							
							
							
							
							There is a bug setting the redis db in the common nosql manager whereby the db path
always fails.
This PR fixes this.
Signed-off-by: Andrew Thornton <art27@cantab.net> 
							
						 
						
							2021-05-03 13:24:24 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zeripath 
								
							 
						 
						
							
							
								
							
							
	
	
	d11b9fbcce 
 
						 
						
							
							
								
								
								Prevent race in TestChannelQueue_Batch ( #15703 )  
							
							... 
							
							
							
							
							There is a potential race in TestChannelQueue_Batch due to boost workers starting up
This PR simply removes the boosts from this test.
Signed-off-by: Andrew Thornton <art27@cantab.net> 
							
						 
						
							2021-05-03 17:16:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mlpo 
								
							 
						 
						
							
							
								
							
							
	
	
	5c5cfd6b18 
 
						 
						
							
							
								
								
								Improve Light Chroma style ( #15699 )  
							
							... 
							
							
							
							
							* Improve Light Chroma style
* Light Chroma style: avoid close colors
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: techknowlogick <techknowlogick@gitea.io> 
							
						 
						
							2021-05-02 22:43:08 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									GiteaBot 
								
							 
						 
						
							
							
								
							
							
	87f8a3d39b  
						 
						
							
							
								
								
								[skip ci] Updated translations via Crowdin  
							
							
							
							
						 
						
							2021-05-03 00:12:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KN4CK3R 
								
							 
						 
						
							
							
								
							
							
	
	
	8c8471e754 
 
						 
						
							
							
								
								
								Addition to  (Add Location, Website and Description to API  #15675 ) ( #15690 )  
							
							... 
							
							
							
							
							* Use same name as other structs.
* Sync with normal forms.
* Edit description with API.
* Workaround for nil value. 
							
						 
						
							2021-05-02 21:03:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zeripath 
								
							 
						 
						
							
							
								
							
							
	
	
	0590176a23 
 
						 
						
							
							
								
								
								Only use boost workers for leveldb shadow queues ( #15696 )  
							
							... 
							
							
							
							
							* The leveldb shadow queue of a persistable channel queue should always start with 0
workers and just use boost to add additional workers if necessary.
* create a zero boost so that if there are no workers in a pool - boost to start the workers
* actually set timeout appropriately on boosted workers
Signed-off-by: Andrew Thornton <art27@cantab.net> 
							
						 
						
							2021-05-02 08:22:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zeripath 
								
							 
						 
						
							
							
								
							
							
	
	
	6ebd833780 
 
						 
						
							
							
								
								
								Fix DB session cleanup ( #15697 )  
							
							... 
							
							
							
							
							The DB session clean up needs to check expiry not created_unix.
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de> 
							
						 
						
							2021-05-01 22:51:03 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zeripath 
								
							 
						 
						
							
							
								
							
							
	
	
	a926ff919d 
 
						 
						
							
							
								
								
								Performance improvement for last commit cache and show-ref ( #15455 )  
							
							... 
							
							
							
							
							* Improve performance when there are multiple commits in the last commit cache
* read refs directly if we can
Signed-off-by: Andrew Thornton <art27@cantab.net> 
							
						 
						
							2021-05-02 03:16:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kyle D 
								
							 
						 
						
							
							
								
							
							
	
	
	fda2e4549f 
 
						 
						
							
							
								
								
								Move tooltip down to allow selection of Remove File on error ( #15672 )  
							
							
							
							
						 
						
							2021-05-01 17:33:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	a64cdfd4fd 
 
						 
						
							
							
								
								
								Markdown CSS tweaks ( #15572 )  
							
							... 
							
							
							
							
							Update Markdown CSS to more closely match GH rendering. Changes include
better nested list margins and tweaked font sizes.
Co-authored-by: Lauris BH <lauris@nix.lv> 
							
						 
						
							2021-05-01 17:32:43 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									a1012112796 
								
							 
						 
						
							
							
								
							
							
	
	
	ae6d7860be 
 
						 
						
							
							
								
								
								add cron job to delete old actions from database ( #15688 )  
							
							... 
							
							
							
							
							that's a way to save database storage space.
Signed-off-by: a1012112796 <1012112796@qq.com> 
							
						 
						
							2021-05-01 14:17:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KN4CK3R 
								
							 
						 
						
							
							
								
							
							
	
	
	ca0460beb7 
 
						 
						
							
							
								
								
								Unify integration test configs. ( #15650 )  
							
							
							
							
						 
						
							2021-05-01 10:54:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KN4CK3R 
								
							 
						 
						
							
							
								
							
							
	
	
	67e10397af 
 
						 
						
							
							
								
								
								Add Location, Website and Biography to API ( #15675 )  
							
							
							
							
						 
						
							2021-05-01 10:05:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									GiteaBot 
								
							 
						 
						
							
							
								
							
							
	5811e162ae  
						 
						
							
							
								
								
								[skip ci] Updated translations via Crowdin  
							
							
							
							
						 
						
							2021-05-01 00:12:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KN4CK3R 
								
							 
						 
						
							
							
								
							
							
	
	
	7670c1c99e 
 
						 
						
							
							
								
								
								Fixed several activation bugs ( #15473 )  
							
							... 
							
							
							
							
							* Removed unneeded form tag.
* Fixed typo.
* Fixed NPE.
* Use better error page.
* Splitted GET and POST. 
							
						 
						
							2021-04-30 22:21:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KN4CK3R 
								
							 
						 
						
							
							
								
							
							
	
	
	ee3fb92419 
 
						 
						
							
							
								
								
								Delete references if repository gets deleted ( #15681 )  
							
							... 
							
							
							
							
							* Remove DeletedBranch and LFSLocks.
* Sort beans.
Co-authored-by: zeripath <art27@cantab.net> 
							
						 
						
							2021-04-30 21:10:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lunny Xiao 
								
							 
						 
						
							
							
								
							
							
	
	
	f5eb33c354 
 
						 
						
							
							
								
								
								Fix orphaned objects deletion bug ( #15657 )  
							
							... 
							
							
							
							
							* Fix orphaned objects deletion bug
* extend test
Co-authored-by: 6543 <6543@obermui.de> 
							
						 
						
							2021-04-30 20:08:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KN4CK3R 
								
							 
						 
						
							
							
								
							
							
	
	
	c80d7f33b6 
 
						 
						
							
							
								
								
								Unified link creation. ( #15619 )  
							
							
							
							
						 
						
							2021-04-30 19:25:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KN4CK3R 
								
							 
						 
						
							
							
								
							
							
	
	
	1456978246 
 
						 
						
							
							
								
								
								Added missing prefix on install route. ( #15677 )  
							
							... 
							
							
							
							
							Co-authored-by: techknowlogick <techknowlogick@gitea.io> 
							
						 
						
							2021-04-30 11:59:16 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									yearski 
								
							 
						 
						
							
							
								
							
							
	
	
	49b28956e2 
 
						 
						
							
							
								
								
								Docs: fix location for custom/options/license ( #15671 )  
							
							
							
							
						 
						
							2021-04-30 16:36:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									6543 
								
							 
						 
						
							
							
								
							
							
	
	
	a6bfe59b4b 
 
						 
						
							
							
								
								
								Docs: renderers rst: rst2html.py -> pandoc ( #15659 )  
							
							
							
							
						 
						
							2021-04-30 14:50:55 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KN4CK3R 
								
							 
						 
						
							
							
								
							
							
	
	
	2e85165349 
 
						 
						
							
							
								
								
								Delete protected branch if repository gets removed ( #15658 )  
							
							... 
							
							
							
							
							* Added missing error parameters.
* Delete protected branch if repository gets removed.
* Added doctor fix. 
							
						 
						
							2021-04-30 00:48:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin Michaelis 
								
							 
						 
						
							
							
								
							
							
	
	
	d576126286 
 
						 
						
							
							
								
								
								Remove random password in Dockerfiles ( #15362 )  
							
							... 
							
							
							
							
							* Remove random password of git user in dockerfile
* Disable git user account in rootless dockerfile 
							
						 
						
							2021-04-29 19:48:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Garrit Franke 
								
							 
						 
						
							
							
								
							
							
	
	
	f67e36097a 
 
						 
						
							
							
								
								
								fix(settings): misaligned buttons ( #15656 )  
							
							... 
							
							
							
							
							Co-authored-by: 6543 <6543@obermui.de> 
							
						 
						
							2021-04-29 13:05:07 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lunny Xiao 
								
							 
						 
						
							
							
								
							
							
	
	
	d7dbe4feeb 
 
						 
						
							
							
								
								
								Fix readme render bug ( #15649 )  
							
							
							
							
						 
						
							2021-04-28 22:22:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zeripath 
								
							 
						 
						
							
							
								
							
							
	
	
	2c57352a30 
 
						 
						
							
							
								
								
								Remove spurious set name from eventsource.sharedworker.js ( #15643 )  
							
							... 
							
							
							
							
							Fix  #15617 
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> 
						
							2021-04-28 10:40:04 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									a1012112796 
								
							 
						 
						
							
							
								
							
							
	
	
	1e877613bf 
 
						 
						
							
							
								
								
								add /assets as root dir of public files ( #15219 )  
							
							... 
							
							
							
							
							* add `/assets` as root dir of public files
Signed-off-by: a1012112796 <1012112796@qq.com>
* move serviceworker.js
* make fmt
* fix some link
* fix test
* Apply suggestions from code review
Co-authored-by: silverwind <me@silverwind.io>
* Apply suggestions from code review
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net> 
							
						 
						
							2021-04-28 12:35:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	cc7d118b12 
 
						 
						
							
							
								
								
								Remove x-ua-compatible header ( #15640 )  
							
							... 
							
							
							
							
							The header is deprecated since IE 11 so it only serves to support IE 10
and below which are browsers which are long unsupported now. 
							
						 
						
							2021-04-28 03:15:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									a1012112796 
								
							 
						 
						
							
							
								
							
							
	
	
	f31443d6a8 
 
						 
						
							
							
								
								
								not update updated uinx for git gc ( #15637 )  
							
							... 
							
							
							
							
							fix  #15634 
Signed-off-by: a1012112796 <1012112796@qq.com> 
						
							2021-04-28 00:33:16 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									GiteaBot 
								
							 
						 
						
							
							
								
							
							
	e711050450  
						 
						
							
							
								
								
								[skip ci] Updated translations via Crowdin  
							
							
							
							
						 
						
							2021-04-27 00:12:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zeripath 
								
							 
						 
						
							
							
								
							
							
	
	
	b07938be5b 
 
						 
						
							
							
								
								
								Fix commit graph author link ( #15627 )  
							
							... 
							
							
							
							
							The author link on the commit graph is incorrect and isn't providing a link to the author.
Signed-off-by: Andrew Thornton <art27@cantab.net> 
							
						 
						
							2021-04-26 19:02:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lunny Xiao 
								
							 
						 
						
							
							
								
							
							
	
	
	3d5bb3e6a3 
 
						 
						
							
							
								
								
								fix webhook timeout bug ( #15613 )  
							
							... 
							
							
							
							
							* Also fix the potential problem in httplib 
							
						 
						
							2021-04-25 21:48:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dong Nguyen 
								
							 
						 
						
							
							
								
							
							
	
	
	6ea6e2b4eb 
 
						 
						
							
							
								
								
								Update config-cheat-sheet.en-us.md ( #15606 )  
							
							... 
							
							
							
							
							Add more guide about `PROVIDER_CONFIG` when `PROVIDER` is `db` (https://github.com/go-gitea/gitea/issues/14016 ) 
							
						 
						
							2021-04-24 16:58:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	ec69f34726 
 
						 
						
							
							
								
								
								Update JS dependencies ( #15591 )  
							
							... 
							
							
							
							
							* Update JS dependencies
- Update all JS dependencies
- Regenerate SVGs
- Remove unused postcss dependency
- Remove removed webpack option
* re-add postcss
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> 
							
						 
						
							2021-04-24 13:07:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									techknowlogick 
								
							 
						 
						
							
							
								
							
							
	
	
	ea40eb749b 
 
						 
						
							
							
								
								
								Resolve panic on failed interface conversion in migration v156 ( #15604 )  
							
							... 
							
							
							
							
							go panics otherwise with `panic: interface conversion: error is git.ErrNotExist, not *git.ErrNotExist`, thanks to Codeberg/Andi for reporting this.
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> 
							
						 
						
							2021-04-24 11:14:39 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lunny Xiao 
								
							 
						 
						
							
							
								
							
							
	
	
	1b3dbdba4e 
 
						 
						
							
							
								
								
								Attachment support repository route ( #15580 )  
							
							
							
							
						 
						
							2021-04-23 11:18:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									6543 
								
							 
						 
						
							
							
								
							
							
	
	
	bee8ce342f 
 
						 
						
							
							
								
								
								Fix go-fuzz ( #15596 )  
							
							... 
							
							
							
							
							* Fix go-fuzz
followup of https://github.com/go-gitea/gitea/pull/15175 
* simplify
* enhance 
							
						 
						
							2021-04-23 16:22:52 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									GiteaBot 
								
							 
						 
						
							
							
								
							
							
	e91932bc15  
						 
						
							
							
								
								
								[skip ci] Updated translations via Crowdin  
							
							
							
							
						 
						
							2021-04-23 00:12:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									6543 
								
							 
						 
						
							
							
								
							
							
	
	
	792b4dba2c 
 
						 
						
							
							
								
								
								[Vendor] Update directly used dependencys ( #15593 )  
							
							... 
							
							
							
							
							* update github.com/blevesearch/bleve v2.0.2 -> v2.0.3
* github.com/denisenkom/go-mssqldb v0.9.0 -> v0.10.0
* github.com/editorconfig/editorconfig-core-go v2.4.1 -> v2.4.2
* github.com/go-chi/cors v1.1.1 -> v1.2.0
* github.com/go-git/go-billy v5.0.0 -> v5.1.0
* github.com/go-git/go-git v5.2.0 -> v5.3.0
* github.com/go-ldap/ldap v3.2.4 -> v3.3.0
* github.com/go-redis/redis v8.6.0 -> v8.8.2
* github.com/go-sql-driver/mysql v1.5.0 -> v1.6.0
* github.com/go-swagger/go-swagger v0.26.1 -> v0.27.0
* github.com/lib/pq v1.9.0 -> v1.10.1
* github.com/mattn/go-sqlite3 v1.14.6 -> v1.14.7
* github.com/go-testfixtures/testfixtures v3.5.0 -> v3.6.0
* github.com/issue9/identicon v1.0.1 -> v1.2.0
* github.com/klauspost/compress v1.11.8 -> v1.12.1
* github.com/mgechev/revive v1.0.3 -> v1.0.6
* github.com/microcosm-cc/bluemonday v1.0.7 -> v1.0.8
* github.com/niklasfasching/go-org v1.4.0 -> v1.5.0
* github.com/olivere/elastic v7.0.22 -> v7.0.24
* github.com/pelletier/go-toml v1.8.1 -> v1.9.0
* github.com/prometheus/client_golang v1.9.0 -> v1.10.0
* github.com/xanzy/go-gitlab v0.44.0 -> v0.48.0
* github.com/yuin/goldmark v1.3.3 -> v1.3.5
* github.com/6543/go-version v1.2.4 -> v1.3.1
* do github.com/lib/pq v1.10.0 -> v1.10.1 again ... 
							
						 
						
							2021-04-22 20:08:53 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	834fc74873 
 
						 
						
							
							
								
								
								Raw file view tweaks ( #15520 )  
							
							... 
							
							
							
							
							- Limit SVG images to 600px width
- Adjust size of view toggle buttons to match other buttons
- Make Edit/Delete buttons easier to click
Had to create a separate CSS file because the less parser can not parse
CSS4 case-insensitive attribute selectors which are widely supported by
browsers.
Fixes: https://github.com/go-gitea/gitea/issues/15515  
							
						 
						
							2021-04-22 23:43:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									6543 
								
							 
						 
						
							
							
								
							
							
	
	
	8ea1d32bea 
 
						 
						
							
							
								
								
								[Vendor] update certmagic ( #15590 )  
							
							... 
							
							
							
							
							* update github.com/caddyserver/certmagic v0.12.0 -> v0.13.0
* migrate 
							
						 
						
							2021-04-22 22:42:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lunny Xiao 
								
							 
						 
						
							
							
								
							
							
	
	
	e7fc078891 
 
						 
						
							
							
								
								
								Fix missing storage init ( #15589 )  
							
							
							
							
						 
						
							2021-04-22 18:48:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zeripath 
								
							 
						 
						
							
							
								
							
							
	
	
	d6a33cef23 
 
						 
						
							
							
								
								
								If the default branch is not present do not report error on stats indexing (follow-up of  #15546 ) ( #15583 )  
							
							... 
							
							
							
							
							#15546  doesn't completely fix this problem because the error returned is an ObjectNotExist
error not a BranchNotExist error.
Add test for ErrObjectNotExist too
Fix  #15257 
Signed-off-by: Andrew Thornton <art27@cantab.net> 
						
							2021-04-22 17:35:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Björn Heinrichs 
								
							 
						 
						
							
							
								
							
							
	
	
	72e0ad8000 
 
						 
						
							
							
								
								
								Fix docker enviroment variable from TYPE to DB_TYPE ( #15585 )  
							
							... 
							
							
							
							
							As documented in https://docs.gitea.io/en-us/config-cheat-sheet/  the database type is defined using db_type not type. 
							
						 
						
							2021-04-22 16:34:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nathan Smith 
								
							 
						 
						
							
							
								
							
							
	
	
	445e47b692 
 
						 
						
							
							
								
								
								Bump unrolled/render to v1.1.0 ( #15581 )  
							
							... 
							
							
							
							
							v1.1.0 has improved buffer pooling 
							
						 
						
							2021-04-22 10:54:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zeripath 
								
							 
						 
						
							
							
								
							
							
	
	
	f719ffc783 
 
						 
						
							
							
								
								
								If the default branch is not present do not report error on stats indexing ( #15546 )  
							
							... 
							
							
							
							
							* If the default branch is not present do not report error on stats indexing
Fix  #15257 
Signed-off-by: Andrew Thornton <art27@cantab.net>
* as per lunny
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io> 
							
						 
						
							2021-04-22 09:19:21 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zeripath 
								
							 
						 
						
							
							
								
							
							
	
	
	df416f2414 
 
						 
						
							
							
								
								
								Add placeholder text to deploy key textarea ( #15575 )  
							
							... 
							
							
							
							
							* Add placeholder text to deploy key textarea
Related #15574 
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Update templates/repo/settings/deploy_keys.tmpl
* Update templates/repo/settings/deploy_keys.tmpl 
							
						 
						
							2021-04-21 16:19:32 -04:00