hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into fix/debug-logs

Browse source
This commit is contained in:
Mark Felder 2024-06-20 09:00:39 -04:00
commit 655ac98478
13 changed files with 79 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/test.exs
View file

@ -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