summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-12-13 15:13:24 +0000
committerlambda <pleromagit@rogerbraun.net>2018-12-13 15:13:24 +0000
commitb19ee62252114d024b52aff3ebb01ac16244990c (patch)
treee78c217696a86d8c2e79eb297558016fa37686a4 /config
parenta5a10988e87dfb7bc4bedf6c9cb3f52e739286d7 (diff)
parent7214d574630842e4efb76d6c3494a180cbc2a930 (diff)
downloadpleroma-b19ee62252114d024b52aff3ebb01ac16244990c.tar.gz
pleroma-b19ee62252114d024b52aff3ebb01ac16244990c.zip
Merge branch 'username-underscores' into 'develop'
Allow underscores/dashes in usernames. Closes #429 See merge request pleroma/pleroma!537
Diffstat (limited to 'config')
-rw-r--r--config/config.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.md b/config/config.md
index dbbfa9194..6b45c01da 100644
--- a/config/config.md
+++ b/config/config.md
@@ -63,6 +63,8 @@ This filter replaces the filename (not the path) of an upload. For complete obfu
* "masto": Copy verbatim, as in Mastodon.
* "noop": Don't copy the subject.
* `always_show_subject_input`: When set to false, auto-hide the subject field when it's empty.
+* `extended_nickname_format`: Set to `true` to use extended local nicknames format (allows underscores/dashes). This will break federation with
+ older software for theses nicknames.
## :fe
This section is used to configure Pleroma-FE, unless ``:managed_config`` in ``:instance`` is set to false.