diff options
| author | lain <lain@soykaf.club> | 2019-10-07 12:31:51 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-07 12:31:51 +0000 |
| commit | 6c278cfe09fb9fd5220743d8f69c6e232623a09b (patch) | |
| tree | 93f1716551e6677193b05f33583579e68ad512c2 /config | |
| parent | e8395bedd2164723b641e1e28cf08e40875893bf (diff) | |
| parent | 0a99f1e8c5551dcf170722e5087a0401b2d907af (diff) | |
| download | pleroma-6c278cfe09fb9fd5220743d8f69c6e232623a09b.tar.gz pleroma-6c278cfe09fb9fd5220743d8f69c6e232623a09b.zip | |
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
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 cf94f1a19..f4d92102f 100644 --- a/config/config.exs +++ b/config/config.exs @@ -409,7 +409,8 @@ config :pleroma, Pleroma.Web.Metadata, providers: [ Pleroma.Web.Metadata.Providers.OpenGraph, Pleroma.Web.Metadata.Providers.TwitterCard, - Pleroma.Web.Metadata.Providers.RelMe + Pleroma.Web.Metadata.Providers.RelMe, + Pleroma.Web.Metadata.Providers.Feed ], unfurl_nsfw: false |