diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-07-24 02:42:28 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-07-24 02:42:28 +0300 |
| commit | f46805bb40bf29cd67acb33b6b65ed1e4e28d3e1 (patch) | |
| tree | 7542dbbe178183e4dd3c3451aa7744f18117fa37 /config | |
| parent | 03471151d6089e318abaf5265d42ffedf7a5b902 (diff) | |
| parent | 1a751529fb2cd3929e3373a908bec5db5cc32f1b (diff) | |
| download | pleroma-f46805bb40bf29cd67acb33b6b65ed1e4e28d3e1.tar.gz pleroma-f46805bb40bf29cd67acb33b6b65ed1e4e28d3e1.zip | |
Merge branch 'develop' into feature/admin-api-user-statuses
Diffstat (limited to 'config')
| -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 bda92e45d..569411866 100644 --- a/config/config.exs +++ b/config/config.exs @@ -345,7 +345,8 @@ config :pleroma, :rich_media, Pleroma.Web.RichMedia.Parsers.TwitterCard, Pleroma.Web.RichMedia.Parsers.OGP, Pleroma.Web.RichMedia.Parsers.OEmbed - ] + ], + ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl] config :pleroma, :media_proxy, enabled: false, |