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	Update copyright notices	2015-01-06 13:21:39 +00:00
auth.py	s/by_token/by_access_token/g	2015-08-20 16:01:29 +01:00
constants.py	Add m.room.avatar to default power levels. Change default required power levels of such events to 50	2015-08-20 14:35:40 +01:00
errors.py	Add endpoint that proxies ID server request token and errors if the given email is in use on this Home Server.	2015-08-04 14:37:09 +01: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 a version 2 of the key server api	2015-04-14 16:04:52 +01:00