summary refs log tree commit diff
path: root/synapse/config/registration.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-01-25 14:33:14 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-01-25 14:33:14 +0000
commit53d25116dff83e16264f1d50db59a29344f3de7a (patch)
tree818d7bf5b55309b4f213ba35bc028d8f42ddc241 /synapse/config/registration.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #4471 from matrix-org/erikj/sqlite_native_upsert (diff)
downloadsynapse-53d25116dff83e16264f1d50db59a29344f3de7a.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/registration.py')
-rw-r--r--synapse/config/registration.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py

index fe520d6855..d808a989f3 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py
@@ -84,11 +84,11 @@ class RegistrationConfig(Config): # # allowed_local_3pids: # - medium: email - # pattern: ".*@matrix\\.org" + # pattern: '.*@matrix\\.org' # - medium: email - # pattern: ".*@vector\\.im" + # pattern: '.*@vector\\.im' # - medium: msisdn - # pattern: "\\+44" + # pattern: '\\+44' # If set, allows registration by anyone who also has the shared # secret, even if registration is otherwise disabled.