Merge branch 'master' into feature-customized-default-locale
This commit is contained in:
		@@ -47,6 +47,16 @@ SMTP_FROM_ADDRESS=notifications@example.com
 | 
			
		||||
# S3_PROTOCOL=http
 | 
			
		||||
# S3_HOSTNAME=192.168.1.123:9000
 | 
			
		||||
 | 
			
		||||
# S3 (Minio Config (optional) Please check Minio instance for details)
 | 
			
		||||
# S3_ENABLED=true
 | 
			
		||||
# S3_BUCKET=
 | 
			
		||||
# AWS_ACCESS_KEY_ID=
 | 
			
		||||
# AWS_SECRET_ACCESS_KEY=
 | 
			
		||||
# S3_REGION=
 | 
			
		||||
# S3_PROTOCOL=https
 | 
			
		||||
# S3_HOSTNAME=
 | 
			
		||||
# S3_ENDPOINT=
 | 
			
		||||
 | 
			
		||||
# Optional alias for S3 if you want to use Cloudfront or Cloudflare in front
 | 
			
		||||
# S3_CLOUDFRONT_HOST=
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user