diff options
| author | Pleroma User <keine@partyheld.de> | 2024-07-06 13:59:30 +0000 |
|---|---|---|
| committer | Pleroma User <keine@partyheld.de> | 2024-07-06 13:59:30 +0000 |
| commit | e4ba5777ee1c0c1d9b079f8aca1b6d9cce014571 (patch) | |
| tree | e246a73319fcceddd4cda50b422e3549bbc5b1aa /config | |
| parent | 56927ffd22e9da98a5c7c4b864d9a70e600a30fa (diff) | |
| parent | 9e3633501bca98a9df34ed3231e55ed038dd86b7 (diff) | |
| download | pleroma-e4ba5777ee1c0c1d9b079f8aca1b6d9cce014571.tar.gz pleroma-e4ba5777ee1c0c1d9b079f8aca1b6d9cce014571.zip | |
Merge branch 'develop' into 'move-poison'
# Conflicts:
# mix.exs
Diffstat (limited to 'config')
| -rw-r--r-- | config/test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index 1e8168548..410b9bbab 100644 --- a/config/test.exs +++ b/config/test.exs @@ -184,7 +184,8 @@ config :pleroma, Pleroma.Uploaders.Uploader, timeout: 1_000 config :pleroma, Pleroma.Emoji.Loader, test_emoji: true -config :pleroma, Pleroma.Web.RichMedia.Backfill, provider: Pleroma.Web.RichMedia.Backfill +config :pleroma, Pleroma.Web.RichMedia.Backfill, + stream_out: Pleroma.Web.ActivityPub.ActivityPubMock if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" |