diff options
| author | feld <feld@feld.me> | 2024-06-20 04:09:22 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-06-20 04:09:22 +0000 |
| commit | d4563f67e09934a23abb230629fa546f548d5f15 (patch) | |
| tree | 0189f8311ed9a27ada428c53c51a20f57f1861fc /config | |
| parent | 9a4cdde5c9e833a8cc61d660f5627717756778d2 (diff) | |
| parent | 17d04ccc8bcf3f0e033ff4333c6153edf904d4f8 (diff) | |
| download | pleroma-d4563f67e09934a23abb230629fa546f548d5f15.tar.gz pleroma-d4563f67e09934a23abb230629fa546f548d5f15.zip | |
Merge branch 'oban/rich-media-backfill' into 'develop'
Rich Media Backfill with Oban
See merge request pleroma/pleroma!4152
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 |