diff options
author | Mark Felder <feld@FreeBSD.org> | 2020-06-17 12:50:06 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2020-06-17 12:50:06 -0500 |
commit | 3462d4b995a995ad523139a865b34a824e02674d (patch) | |
tree | 273a000ee55c9bb6a5344a507025600508227382 /config/config.exs | |
parent | 96493da7bdab4ff4a51cbebf18df4127ddc47990 (diff) | |
parent | d772361e6209e6b5733e9fe52b3671cd222060b3 (diff) | |
download | pleroma-3462d4b995a995ad523139a865b34a824e02674d.tar.gz |
Merge branch 'develop' into issue/1855
Diffstat (limited to 'config/config.exs')
-rw-r--r-- | config/config.exs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 545e0ed69..4bf31f3fc 100644 --- a/config/config.exs +++ b/config/config.exs @@ -387,7 +387,6 @@ config :pleroma, :rich_media, ignore_tld: ["local", "localdomain", "lan"], parsers: [ Pleroma.Web.RichMedia.Parsers.TwitterCard, - Pleroma.Web.RichMedia.Parsers.OGP, Pleroma.Web.RichMedia.Parsers.OEmbed ], ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl] |