Merge branch 'fix/missing-config-settings' into 'develop'

Add missing invites_enabled and account_activation_required settings

See merge request pleroma/pleroma!2234
This commit is contained in:
feld 2020-02-22 15:35:33 +00:00
commit 1961a680ec

View file

@ -219,6 +219,8 @@
max_expiration: 365 * 24 * 60 * 60
},
registrations_open: true,
invites_enabled: false,
account_activation_required: false,
federating: true,
federation_incoming_replies_max_depth: 100,
federation_reachability_timeout_days: 7,