diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-07-29 12:43:39 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-07-29 12:43:39 -0500 |
| commit | d8a01c94321e90832fea5a26fbb2a2f5be1c5ba5 (patch) | |
| tree | 43a18b75775223594f58860098e231068000b0d4 /config/config.exs | |
| parent | 3b7c454418700ca36c0a71272f913ea8c6e464e9 (diff) | |
| parent | a6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (diff) | |
| download | pleroma-d8a01c94321e90832fea5a26fbb2a2f5be1c5ba5.tar.gz pleroma-d8a01c94321e90832fea5a26fbb2a2f5be1c5ba5.zip | |
Merge remote-tracking branch 'upstream/develop' into hide-reactions
Diffstat (limited to 'config/config.exs')
| -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 903a92cca..857e0afbb 100644 --- a/config/config.exs +++ b/config/config.exs @@ -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, |