Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

This commit is contained in:
Ivan Tashkinov 2019-08-24 09:29:54 +03:00
commit c34126f89c
4 changed files with 12 additions and 4 deletions

View file

@ -275,8 +275,8 @@ config :pleroma, :instance,
user_name_length: 100,
max_account_fields: 10,
max_remote_account_fields: 20,
account_field_name_length: 255,
account_field_value_length: 255,
account_field_name_length: 512,
account_field_value_length: 512,
external_user_synchronization: true
config :pleroma, :markup,