Merge branch 'develop' into key_distribution

2015-04-24 11:28:10 +01:00 · 2015-04-24 11:28:10 +01:00 · b2c2dc8940
parent b1e68add19 869dc94cbb
commit b2c2dc8940
1 changed files with 1 additions and 0 deletions
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@ -53,6 +53,7 @@ class RegistrationConfig(Config):

    @classmethod
    def generate_config(cls, args, config_dir_path):
+        super(RegistrationConfig, cls).genenerate_config(args, config_dir_path)
        if args.enable_registration is None:
            args.enable_registration = False