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

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 903a92cca0287d9fa402baa9f2b5e6fbbd6e60e4..857e0afbbeebe9f62e532cfaaa6f78120b226b2f 100644 (file)
--- 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,