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	…
v2_alpha	Merge branch 'develop' into refresh	2015-08-20 16:25:40 +01:00
__init__.py	…