Merge branch 'develop' into key_distribution

This commit is contained in:
Mark Haines 2015-04-24 11:29:46 +01:00
commit c253b14f6e
1 changed files with 1 additions and 1 deletions

View File

@ -53,7 +53,7 @@ class RegistrationConfig(Config):
@classmethod @classmethod
def generate_config(cls, args, config_dir_path): 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: if args.enable_registration is None:
args.enable_registration = False args.enable_registration = False