Merge branch 'develop' of github.com:matrix-org/synapse into mysql

This commit is contained in:
Erik Johnston 2015-04-07 18:17:22 +01:00
commit d5e7e6b9b6
2 changed files with 3 additions and 3 deletions

View File

@ -40,7 +40,7 @@ class RegistrationConfig(Config):
reg_group.add_argument( reg_group.add_argument(
"--enable-registration", "--enable-registration",
const=False, const=True,
default=False, default=False,
nargs='?', nargs='?',
help="Enable registration for new users.", help="Enable registration for new users.",