Commit 340ab3cb authored by kaniini's avatar kaniini
Browse files

Merge branch 'bugfix/s3-configuration' into 'develop'

config: fix up defaults for s3 endpoint configuration

See merge request !312
parents 03ecbe04 de5bd6fc
Pipeline #3459 passed with stages
in 5 minutes
......@@ -16,7 +16,9 @@
config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
config :pleroma, Pleroma.Uploaders.S3, s3_bucket: nil
config :pleroma, Pleroma.Uploaders.S3,
bucket: nil,
public_endpoint: ""
config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment