Merge from upstream master

This commit is contained in:
mogita
2019-06-24 11:29:21 +08:00
44 changed files with 595 additions and 7793 deletions

View File

@@ -35,11 +35,11 @@ BUGSNAG_KEY=
GITHUB_ACCESS_TOKEN=
# AWS credentials (optional in dev)
# Update the bucket URL according to your choice on AWS
AWS_ACCESS_KEY_ID=get_a_key_from_aws
AWS_SECRET_ACCESS_KEY=get_the_secret_of_above_key
AWS_S3_UPLOAD_BUCKET_URL=https://s3-ap-southeast-1.amazonaws.com
AWS_S3_UPLOAD_BUCKET_NAME=bucket-name-here
AWS_REGION=ap-xxxxx-1
AWS_S3_UPLOAD_BUCKET_URL=http://s3:4569
AWS_S3_UPLOAD_BUCKET_NAME=bucket_name_here
AWS_S3_UPLOAD_MAX_SIZE=26214400
# Emails configuration (optional)