summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-01 11:55:26 +0100
committerErik Johnston <erik@matrix.org>2015-09-01 11:55:26 +0100
commit9c8eb4a80945be4a640abfbe736de82e0fac450d (patch)
tree33b6fbbb39b9b4c805b7f7d737bef64d66c1299e /synapse
parentLower size of 'stateGroupCache' now that we have data from matrix.org to supp... (diff)
parentRemove spurious .py from docs (diff)
downloadsynapse-9c8eb4a80945be4a640abfbe736de82e0fac450d.tar.xz
Merge pull request #261 from matrix-org/erikj/scripts_clean
Clean up scripts/
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/_base.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py

index d01235d31f..1a6784a714 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py
@@ -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)