diff options
| author | feld <feld@feld.me> | 2020-02-22 15:35:33 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-02-22 15:35:33 +0000 |
| commit | 1961a680ec8fb333fa34a7b102820388c9cf5aa6 (patch) | |
| tree | 948934fff4030bbf6bb4bb83dcc83c4afa234511 | |
| parent | 114e7b764ed5ae03211cca40e7b19f33292b3d1c (diff) | |
| parent | 9fe60c3b9c242621177cb8c182f4e23a2ada14e7 (diff) | |
Merge branch 'fix/missing-config-settings' into 'develop'
Add missing invites_enabled and account_activation_required settings
See merge request pleroma/pleroma!2234
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 641b2c867..42e2d06a8 100644 --- a/config/config.exs +++ b/config/config.exs @@ -219,6 +219,8 @@ config :pleroma, :instance, 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, |