forked-synapse/tests/rest/client
Daniel Wagner-Hall e8cf77fa49 Merge branch 'develop' into refresh
Conflicts:
	synapse/rest/client/v1/login.py
2015-08-20 16:25:40 +01:00
..
v1 s/by_token/by_access_token/g 2015-08-20 16:01:29 +01:00
v2_alpha Merge branch 'develop' into refresh 2015-08-20 16:25:40 +01:00
__init__.py Move client rest tests back under rest 2015-01-22 16:13:27 +00:00