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

auth.py

Merge branch 'develop' of github.com:matrix-org/synapse into rejections

2015-01-30 11:10:37 +00:00

constants.py

Start implementing auth conflict res

2015-01-28 16:16:53 +00:00

errors.py

Code style fixes.

2015-01-29 16:12:40 +00:00

ratelimiting.py

Update copyright notices

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

urls.py

Add client v2_alpha resource to synapse server resource tree

2015-01-23 18:55:19 +00:00