summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-24 11:28:10 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-24 11:28:10 +0100
commitb2c2dc8940fc0abe97f0dbfb8c5fa3a4acfe75a8 (patch)
tree1e45e884e10bc9c64a0d904df0786f6070a1234b /synapse/config
parentAdd a config file for perspective servers (diff)
parentCall the super classes when generating config (diff)
downloadsynapse-b2c2dc8940fc0abe97f0dbfb8c5fa3a4acfe75a8.tar.xz
Merge branch 'develop' into key_distribution
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/registration.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index d5c8f4bf7b..ad81cc4f45 100644
--- 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