Merge branch 'develop' into global-status-expiration
This commit is contained in:
commit
421e35b578
108 changed files with 1235 additions and 886 deletions
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue