diff options
| author | dtluna <dtluna@openmailbox.org> | 2017-04-28 16:06:57 +0300 |
|---|---|---|
| committer | dtluna <dtluna@openmailbox.org> | 2017-04-28 16:06:57 +0300 |
| commit | a9b2ad17596d1b6deca646239a95e94dc644ebf3 (patch) | |
| tree | 9e086441831f33e191cd62b05b61ece0677491cc /config | |
| parent | 28b203d08fe2e0d7afe3f3ec03a16cef62288b23 (diff) | |
| parent | fb5cebc1b5dcfd6af7fa1a81bc5b26275714fa26 (diff) | |
| download | pleroma-a9b2ad17596d1b6deca646239a95e94dc644ebf3.tar.gz pleroma-a9b2ad17596d1b6deca646239a95e94dc644ebf3.zip | |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 6 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 2b041b10f..3826dddff 100644 --- a/config/config.exs +++ b/config/config.exs @@ -26,6 +26,12 @@ config :logger, :console, format: "$time $metadata[$level] $message\n", metadata: [:request_id] +config :mime, :types, %{ + "application/xrd+xml" => ["xrd+xml"] +} + +config :pleroma, :websub_verifier, Pleroma.Web.Websub + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env}.exs" diff --git a/config/test.exs b/config/test.exs index f5d6f240d..5d91279a2 100644 --- a/config/test.exs +++ b/config/test.exs @@ -24,3 +24,5 @@ config :pleroma, Pleroma.Repo, # Reduce hash rounds for testing config :comeonin, :pbkdf2_rounds, 1 + +config :pleroma, :websub_verifier, Pleroma.Web.WebsubMock |