summary refs log tree commit diff
path: root/synapse/config/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-14 18:04:36 +0100
committerErik Johnston <erik@matrix.org>2015-09-14 18:04:36 +0100
commit228465b0ecfc7d7137ac3acaf30050e234957b6a (patch)
tree1e273d754bc819fecfb877e19a15a08b4d1e231a /synapse/config/_base.py
parentOnly allow people to set the alias list for their own domain. (diff)
parentMerge pull request #265 from matrix-org/erikj/check_room_exists (diff)
downloadsynapse-erikj/check_alias.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/check_alias github/erikj/check_alias erikj/check_alias
Diffstat (limited to 'synapse/config/_base.py')
-rw-r--r--synapse/config/_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py

index 1a6784a714..8a75c48733 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py
@@ -182,7 +182,7 @@ class Config(object): ) % (entry_path, ) continue - files.add(config_path) + files.append(entry_path) config_files.extend(sorted(files)) else: