summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-25 15:56:31 +0000
committerErik Johnston <erik@matrix.org>2016-01-25 15:56:31 +0000
commit3a75159832933f5a1906cc1b4a6fccb59724b65f (patch)
tree810fd53c047462a2376d9df64e2a7a862183ce20
parentMerge branch 'erikj/filters' of github.com:matrix-org/synapse into develop (diff)
parentUnderscores are allowed in user ids (diff)
downloadsynapse-3a75159832933f5a1906cc1b4a6fccb59724b65f.tar.xz
Merge pull request #521 from matrix-org/erikj/underscores
Underscores are allowed in user ids
Diffstat (limited to '')
-rw-r--r--synapse/handlers/register.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 1e99c1303c..c11b98d0b7 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -52,7 +52,7 @@ class RegistrationHandler(BaseHandler):
         if urllib.quote(localpart.encode('utf-8')) != localpart:
             raise SynapseError(
                 400,
-                "User ID can only contain characters a-z, 0-9, or '-./'",
+                "User ID can only contain characters a-z, 0-9, or '_-./'",
                 Codes.INVALID_USERNAME
             )