diff options
| author | lain <lain@soykaf.club> | 2019-10-05 10:42:29 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-05 10:42:29 +0200 |
| commit | d9aaea44ff02d6a07d3be0f0675830eb51ac85ef (patch) | |
| tree | ce715c85f98875dd0ddf133f95a071fd40b91335 /config | |
| parent | 8e83c8423fa846e82103b20798f0cbde676354ff (diff) | |
| parent | 9c47d8571c6c46503d9bb836aea933eda6e9e0a5 (diff) | |
| download | pleroma-d9aaea44ff02d6a07d3be0f0675830eb51ac85ef.tar.gz pleroma-d9aaea44ff02d6a07d3be0f0675830eb51ac85ef.zip | |
Merge remote-tracking branch 'origin/develop' into reactions
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 36bea19a0..ddbfb246a 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 |