diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-15 15:31:30 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-15 15:31:30 +0000 |
| commit | 8cb9580aec10f0f258f4fbd82065d02b0a82b003 (patch) | |
| tree | ef848d1363e7c31b8dab454fe5b34d23dec0a2fd /config | |
| parent | cc6689cc203d44e19e9aa14c2ef3a3dad823ef88 (diff) | |
| parent | 5af91020f83acf3acad8511799e4b4e9ecda5b76 (diff) | |
| download | pleroma-8cb9580aec10f0f258f4fbd82065d02b0a82b003.tar.gz pleroma-8cb9580aec10f0f258f4fbd82065d02b0a82b003.zip | |
Merge branch 'bugfix/webfinger-jrd' into 'develop'
Fix requesting application/jrd+json on webfinger
See merge request pleroma/pleroma!553
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 1401b0a3d..1777a54c0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -65,6 +65,7 @@ config :logger, :console, config :mime, :types, %{ "application/xml" => ["xml"], "application/xrd+xml" => ["xrd+xml"], + "application/jrd+json" => ["jrd+json"], "application/activity+json" => ["activity+json"], "application/ld+json" => ["activity+json"] } |