David Baker 6532b6e607 Merge branch 'develop' into csauth ... Conflicts: synapse/http/server.py		2015-04-24 09:37:54 +01:00
..
__init__.py	Update copyright notices	2015-01-06 13:21:39 +00:00
client.py	New registration for C/S API v2. Only ReCAPTCHA working currently.	2015-03-30 18:13:10 +01:00
endpoint.py	Update copyright notices	2015-01-06 13:21:39 +00:00
matrixfederationclient.py	Appease pep8	2015-03-12 16:24:51 +00:00
server.py	Merge branch 'develop' into csauth	2015-04-24 09:37:54 +01:00
servlet.py	Combine the request wrappers in rest/media/v1 and http/server into a single wrapper decorator	2015-04-21 16:35:53 +01:00