Mark Haines 998a72d4d9 Merge branch 'develop' into markjh/twisted-15 ...

Conflicts:
	synapse/http/matrixfederationclient.py

2015-08-12 17:21:14 +01:00

..

__init__.py

Update copyright notices

2015-01-06 13:21:39 +00:00

client.py

Fix log context when sending requests

2015-06-19 11:46:49 +01:00

endpoint.py

Update copyright notices

2015-01-06 13:21:39 +00:00

matrixfederationclient.py

Merge branch 'develop' into markjh/twisted-15

2015-08-12 17:21:14 +01:00

server.py

Don't 500 if a group is missing from the regex

2015-07-06 16:47:17 +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