diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-07 01:20:50 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-07 01:20:50 +0300 |
| commit | 01fe5abad1a98b98a0dd5e3c04bf65809389fd78 (patch) | |
| tree | b829b75c225b8ffbacd22884693a622dc7584a70 /config/test.exs | |
| parent | b1b1a270e8f17b76d08771ca1e4025b1d227da05 (diff) | |
| parent | 62cdf701f47352004c293c3ca049d232b3d16af7 (diff) | |
| download | pleroma-01fe5abad1a98b98a0dd5e3c04bf65809389fd78.tar.gz pleroma-01fe5abad1a98b98a0dd5e3c04bf65809389fd78.zip | |
Resolve conflicts
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index adb874223..cecb16184 100644 --- a/config/test.exs +++ b/config/test.exs @@ -17,6 +17,8 @@ config :pleroma, Pleroma.Captcha, # Print only warnings and errors during test config :logger, level: :warn +config :pleroma, :auth, oauth_consumer_strategies: [] + config :pleroma, Pleroma.Upload, filters: [], link_name: false config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads" |