Mark Haines 4ad8b45155 Merge branch 'develop' into key_distribution ... Conflicts: synapse/config/homeserver.py		2015-04-29 13:15:14 +01:00
..
__init__.py	…
auth.py	Merge pull request #126 from matrix-org/csauth	2015-04-28 11:00:27 +01:00
constants.py	…
errors.py	…
filtering.py	…
ratelimiting.py	…
urls.py	…