diff options
| author | Mark Felder <feld@feld.me> | 2024-06-20 09:00:39 -0400 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2024-06-20 09:00:39 -0400 |
| commit | 655ac98478d01c60f217db9d4dc56015e22b0c06 (patch) | |
| tree | a1be007c2826271e1059e597fcf845d6c7e97cb7 /config | |
| parent | e1e099d3bff122a28cfd0c5c340d672050929051 (diff) | |
| parent | 4a881ba366a9b067e8f6bbd30ce12a30ab0724a1 (diff) | |
| download | pleroma-655ac98478d01c60f217db9d4dc56015e22b0c06.tar.gz pleroma-655ac98478d01c60f217db9d4dc56015e22b0c06.zip | |
Merge remote-tracking branch 'origin/develop' into fix/debug-logs
Diffstat (limited to 'config')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/test.exs b/config/test.exs index 9afb2763a..1e8168548 100644 --- a/config/test.exs +++ b/config/test.exs @@ -180,8 +180,6 @@ config :pleroma, Pleroma.Application, config :pleroma, Pleroma.Web.Streaming, sync_streaming: true -config :pleroma, Pleroma.Web.MastodonAPI.StatusView, sync_fetching: true - config :pleroma, Pleroma.Uploaders.Uploader, timeout: 1_000 config :pleroma, Pleroma.Emoji.Loader, test_emoji: true |