Mark Haines 4ad8b45155 Merge branch 'develop' into key_distribution ... Conflicts: synapse/config/homeserver.py		2015-04-29 13:15:14 +01:00
..
__init__.py	…
homeserver.py	Merge branch 'develop' into key_distribution	2015-04-29 13:15:14 +01:00
synctl.py	…