diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 09:30:49 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 09:30:49 +0300 |
| commit | f459aabdfafa990b33610438650f882ccac072d2 (patch) | |
| tree | e5bfcb4f8fc7c2dd06e08f90b3a841c4f9ad759a /config | |
| parent | 6ffa2b5f661c2db424334c6fb5de6f4d1bfeb745 (diff) | |
| parent | 9e34919dcdbeedf8eb623dc86b05f63ef44d8859 (diff) | |
| download | pleroma-f459aabdfafa990b33610438650f882ccac072d2.tar.gz pleroma-f459aabdfafa990b33610438650f882ccac072d2.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 92adf442c..cf94f1a19 100644 --- a/config/config.exs +++ b/config/config.exs @@ -279,7 +279,8 @@ config :pleroma, :instance, max_remote_account_fields: 20, account_field_name_length: 512, account_field_value_length: 2048, - external_user_synchronization: true + external_user_synchronization: true, + extended_nickname_format: false config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because |