diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-18 10:26:41 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-18 10:26:41 +0300 |
| commit | 2a96283efbd46c017cf9e15ef4fda3188e5e5bca (patch) | |
| tree | 3265b9ff9f830a366d14870486c85ddcd08f51c9 /config/test.exs | |
| parent | 273905744242b013ba9736ff7e1415a0499022d1 (diff) | |
| parent | 1344e34ed3a337b54e450af474f81e2f326bf768 (diff) | |
| download | pleroma-2a96283efbd46c017cf9e15ef4fda3188e5e5bca.tar.gz pleroma-2a96283efbd46c017cf9e15ef4fda3188e5e5bca.zip | |
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index a3f36c9e1..3691e5bd1 100644 --- a/config/test.exs +++ b/config/test.exs @@ -17,7 +17,7 @@ config :pleroma, Pleroma.Captcha, # Print only warnings and errors during test config :logger, level: :warn -config :pleroma, Pleroma.Upload, link_name: false +config :pleroma, Pleroma.Upload, filters: [], link_name: false config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads" |