Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2015-09-01 13:11:55 +01:00
commit b62c1395d6
7 changed files with 7 additions and 376 deletions

View file

@ -182,6 +182,8 @@ class Config(object):
) % (entry_path, )
continue
files.add(config_path)
config_files.extend(sorted(files))
else:
config_files.append(config_path)