diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-14 18:05:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-14 18:05:31 +0100 |
| commit | d59acb8c5b7ff74b0045b1e4df0c79ce6f645004 (patch) | |
| tree | b7427c8e6cf1d48cab0341fbcbda307707e75338 /synapse/config/_base.py | |
| parent | Also check the domains for membership state_keys (diff) | |
| parent | Merge pull request #265 from matrix-org/erikj/check_room_exists (diff) | |
| download | synapse-d59acb8c5b7ff74b0045b1e4df0c79ce6f645004.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable
Diffstat (limited to 'synapse/config/_base.py')
| -rw-r--r-- | synapse/config/_base.py | 2 |
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: |