Daniel Wagner-Hall e8cf77fa49 Merge branch 'develop' into refresh ...

Conflicts:
	synapse/rest/client/v1/login.py

2015-08-20 16:25:40 +01:00

..

__init__.py

s/by_token/by_access_token/g

2015-08-20 16:01:29 +01:00

test_filter.py

More unit-testing of REST errors

2015-01-27 18:07:21 +00:00

test_register.py

Fix tests

2015-08-04 15:18:40 +01:00