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	…
auth.py	s/by_token/by_access_token/g	2015-08-20 16:01:29 +01:00
constants.py	…
errors.py	…
filtering.py	…
ratelimiting.py	…
urls.py	…