synapse-product/synapse/rest
David Baker 6532b6e607 Merge branch 'develop' into csauth
Conflicts:
	synapse/http/server.py
2015-04-24 09:37:54 +01:00
..
client Merge branch 'develop' into csauth 2015-04-24 09:37:54 +01:00
key Move server key api into rest/key/v1 2015-04-14 13:28:11 +01:00
media Set a version_string in BaseMediaResource so that the request_handler wrapper works 2015-04-21 16:43:58 +01:00
__init__.py Code style fixes. 2015-01-29 16:12:40 +00:00