diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-05-05 11:46:59 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-05-05 11:46:59 +0200 |
| commit | c48c381e909240dcece9f961e4728fa712d089cc (patch) | |
| tree | 6aa2a1edbfe5d15860ab5090c645bc9ba312ab96 /config/config.exs | |
| parent | 6cf7c132282e612514af992c6dea0b03ee5b678d (diff) | |
| parent | c85998ab8a21f042ab57345a7baa9e1e27c308d1 (diff) | |
| download | pleroma-c48c381e909240dcece9f961e4728fa712d089cc.tar.gz pleroma-c48c381e909240dcece9f961e4728fa712d089cc.zip | |
Merge branch 'develop' into dtluna/pleroma-refactor/1
Diffstat (limited to 'config/config.exs')
| -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 3826dddff..a5df31b5a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -30,7 +30,8 @@ config :mime, :types, %{ "application/xrd+xml" => ["xrd+xml"] } -config :pleroma, :websub_verifier, Pleroma.Web.Websub +config :pleroma, :websub, Pleroma.Web.Websub +config :pleroma, :ostatus, Pleroma.Web.OStatus # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. |