Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-10 12:27:14 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source 
Conflicts:
	setup.py
This commit is contained in:
Mark Haines 2015-09-07 15:06:46 +01:00
commit 73e4ad4b8b
7 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/config/_base.py
View file

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