forked-synapse/synapse/http
Erik Johnston 2ebf795c0a Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts:
	synapse/storage/__init__.py
	synapse/storage/schema/delta/v12.sql
2015-01-30 11:10:37 +00:00
..
__init__.py Update copyright notices 2015-01-06 13:21:39 +00:00
agent_name.py Update copyright notices 2015-01-06 13:21:39 +00:00
client.py Merge branch 'develop' into pushers 2015-01-13 13:15:51 +00:00
endpoint.py Update copyright notices 2015-01-06 13:21:39 +00:00
matrixfederationclient.py Make post_json(...) actually send data. 2015-01-29 13:58:22 +00:00
server_key_resource.py Update copyright notices 2015-01-06 13:21:39 +00:00
server.py Oops: second part of commit dc938606 2015-01-22 17:38:53 +00:00
servlet.py Add client v2_alpha resource to synapse server resource tree 2015-01-23 18:55:19 +00:00