Daniel Wagner-Hall e8cf77fa49 Merge branch 'develop' into refresh ... Conflicts: synapse/rest/client/v1/login.py		2015-08-20 16:25:40 +01:00
..
api	s/by_token/by_access_token/g	2015-08-20 16:01:29 +01:00
appservice	…
federation	…
handlers	Move token generation to auth handler	2015-08-20 11:35:56 +01:00
metrics	…
rest	Merge branch 'develop' into refresh	2015-08-20 16:25:40 +01:00
storage	/tokenrefresh POST endpoint	2015-08-20 16:21:35 +01:00
util	…
__init__.py	…
test_distributor.py	…
test_state.py	…
test_test_utils.py	…
test_types.py	…
unittest.py	…
utils.py	s/by_token/by_access_token/g	2015-08-20 16:01:29 +01:00