diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-04-06 20:34:00 +0700 |
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-04-06 20:34:00 +0700 |
| commit | 7410aee886fbb38615bb595b8b7be0722761a0a4 (patch) | |
| tree | 26372ac184398430a0a18f3285dba2b543632fb0 /config | |
| parent | fa8483cb808ef4b8b907d7ec0eeb882f3f47d927 (diff) | |
| parent | 3c5daa0235aaf47eeeda557fd677e3604cb7d701 (diff) | |
| download | pleroma-7410aee886fbb38615bb595b8b7be0722761a0a4.tar.gz pleroma-7410aee886fbb38615bb595b8b7be0722761a0a4.zip | |
Merge develop to 770-add-emoji-tags
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 9d6517b11..8f9dd734f 100644 --- a/config/config.exs +++ b/config/config.exs @@ -124,6 +124,11 @@ config :logger, :ex_syslogger, format: "$metadata[$level] $message", metadata: [:request_id] +config :quack, + level: :warn, + meta: [:all], + webhook_url: "https://hooks.slack.com/services/YOUR-KEY-HERE" + config :mime, :types, %{ "application/xml" => ["xml"], "application/xrd+xml" => ["xrd+xml"], |