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

Merge remote-tracking branch 'upstream/develop' into hide-reactions

Browse source
This commit is contained in:
Alex Gleason 2020-07-29 12:43:39 -05:00
commit d8a01c9432
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
37 changed files with 733 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -205,6 +205,7 @@ config :pleroma, :instance,
registrations_open: true,
invites_enabled: false,
account_activation_required: false,
account_approval_required: false,
federating: true,
federation_incoming_replies_max_depth: 100,
federation_reachability_timeout_days: 7,
@ -237,6 +238,7 @@ config :pleroma, :instance,
max_remote_account_fields: 20,
account_field_name_length: 512,
account_field_value_length: 2048,
registration_reason_length: 500,
external_user_synchronization: true,
extended_nickname_format: true,
cleanup_attachments: false,