David Baker c291a4d522 Merge branch 'develop' into pushers ...

Conflicts:
	synapse/handlers/events.py
	synapse/server.py

2015-01-28 12:51:05 +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

Finish renaming "context" to "room_id" in federation codebase

2015-01-16 19:01:03 +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