Kegan Dougal c059c9fea5 Merge branch 'develop' into application-services ...

Conflicts:
	synapse/handlers/__init__.py
	synapse/storage/__init__.py

2015-02-02 15:57:59 +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 stub application services REST API.

2015-01-27 14:01:51 +00:00