Merge branch 'develop' into feature/digest-email
This commit is contained in:
commit
9d4f34fbcb
81 changed files with 2329 additions and 655 deletions
|
|
@ -29,7 +29,8 @@ config :pleroma, :instance,
|
|||
email: "admin@example.com",
|
||||
notify_email: "noreply@example.com",
|
||||
skip_thread_containment: false,
|
||||
federating: false
|
||||
federating: false,
|
||||
external_user_synchronization: false
|
||||
|
||||
config :pleroma, :activitypub, sign_object_fetches: false
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue