summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-24 11:29:46 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-24 11:29:46 +0100
commitc253b14f6ec4e0efb78bc329f71e63fa3ddb0068 (patch)
treef29fd33ade7d123324d5db2f29d7a37a1fe4ed0e /synapse
parentMerge branch 'develop' into key_distribution (diff)
parentFix spelling (diff)
downloadsynapse-c253b14f6ec4e0efb78bc329f71e63fa3ddb0068.tar.xz
Merge branch 'develop' into key_distribution
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/registration.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index ad81cc4f45..f412a72f59 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -53,7 +53,7 @@ class RegistrationConfig(Config):
 
     @classmethod
     def generate_config(cls, args, config_dir_path):
-        super(RegistrationConfig, cls).genenerate_config(args, config_dir_path)
+        super(RegistrationConfig, cls).generate_config(args, config_dir_path)
         if args.enable_registration is None:
             args.enable_registration = False