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

Conflicts:
	synapse/storage/schema/im.sql

2015-01-30 15:16:38 +00:00

..

__init__.py

Update copyright notices

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

auth.py

Fix bug where we superfluously asked for current state. Change API of /query_auth/ so that we don't duplicate events in the response.

2015-01-30 13:34:01 +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

filtering.py

Use 'in' to test if the key exists, remove unused _filters_for_user

2015-01-30 14:54:06 +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