Mark Haines 4ad8b45155 Merge branch 'develop' into key_distribution ... Conflicts: synapse/config/homeserver.py		2015-04-29 13:15:14 +01:00
..
__init__.py	Update copyright notices	2015-01-06 13:21:39 +00:00
homeserver.py	Merge branch 'develop' into key_distribution	2015-04-29 13:15:14 +01:00
synctl.py	Don't write bytecode	2015-02-17 10:54:06 +00:00