diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-02-08 18:18:28 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-02-08 18:18:28 +0000 |
| commit | f0cde24f71f292b417dfcac663e1f4e6082c833a (patch) | |
| tree | 0f04935f4a7eac8b21e590084ce03cb573d22942 /config | |
| parent | 2f291576e4eef95e6867348e24bc526058518095 (diff) | |
| parent | f0745148a3126e3bc621170791a55713e929c682 (diff) | |
| download | pleroma-f0cde24f71f292b417dfcac663e1f4e6082c833a.tar.gz pleroma-f0cde24f71f292b417dfcac663e1f4e6082c833a.zip | |
Merge branch 'fix/config-disable-chat' into 'develop'
Add config option for enabling/disabling chat.
See merge request pleroma/pleroma!58
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index e71d5e5a0..01109b30f 100644 --- a/config/config.exs +++ b/config/config.exs @@ -56,6 +56,9 @@ config :pleroma, :media_proxy, redirect_on_failure: true #base_url: "https://cache.pleroma.social" +config :pleroma, :chat, + enabled: true + # 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" |