Merge branch 'develop' into global-status-expiration

This commit is contained in:
Egor Kislitsyn 2020-03-16 15:31:31 +04:00
commit 421e35b578
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
108 changed files with 1235 additions and 886 deletions

View file

@ -506,10 +506,6 @@ config :pleroma, :workers,
federator_outgoing: 5
]
config :pleroma, :fetch_initial_posts,
enabled: false,
pages: 5
config :auto_linker,
opts: [
extra: true,