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

Add missing invites_enabled and account_activation_required settings See merge request pleroma/pleroma!2234
2020-02-22 15:35:33 +00:00 · 2020-02-22 15:35:33 +00:00 · 1961a680ec
parent 114e7b764e 9fe60c3b9c
commit 1961a680ec
1 changed files with 2 additions and 0 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -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,