diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-24 08:06:04 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-24 08:06:04 +0300 |
| commit | d75d0ae134e0a8de9504507f4c78567b9eedcc72 (patch) | |
| tree | b7be0da8e19018241cc22509863fefadabe8ff08 /config/config.exs | |
| parent | 494bb6bac64361860db194aed57618450a76177d (diff) | |
| parent | 29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965 (diff) | |
| download | pleroma-d75d0ae134e0a8de9504507f4c78567b9eedcc72.tar.gz pleroma-d75d0ae134e0a8de9504507f4c78567b9eedcc72.zip | |
Merge branch 'develop' into tests/mastodon_api_controller.ex
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 4c758d4a0..403ade60d 100644 --- a/config/config.exs +++ b/config/config.exs @@ -109,6 +109,7 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads" config :pleroma, Pleroma.Uploaders.S3, bucket: nil, + streaming_enabled: true, public_endpoint: "https://s3.amazonaws.com" config :pleroma, Pleroma.Uploaders.MDII, @@ -508,7 +509,7 @@ config :auto_linker, class: false, strip_prefix: false, new_window: false, - rel: false + rel: "ugc" ] config :pleroma, :ldap, |