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

Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

Browse source 
# Conflicts:
#	CHANGELOG.md
#	lib/mix/tasks/pleroma/database.ex
#	lib/pleroma/web/templates/feed/feed/_activity.rss.eex
This commit is contained in:
Ivan Tashkinov 2021-02-11 19:31:57 +03:00
commit 5992382cf8
93 changed files with 2049 additions and 803 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/config.exs
View file

@ -543,6 +543,7 @@ config :pleroma, Oban,
queues: [
activity_expiration: 10,
token_expiration: 5,
filter_expiration: 1,
backup: 1,
federator_incoming: 50,
federator_outgoing: 50,