Matthew Hodgson d9d48aad2d Merge branch 'develop' into matthew/preview_urls		2016-03-27 22:54:42 +01:00
..
client	Merge pull request #652 from matrix-org/erikj/delete_alias	2016-03-18 14:02:46 +00:00
key	Use parse_json_object_from_request to parse JSON out of request bodies	2016-03-11 16:41:03 +00:00
media	Merge branch 'develop' into matthew/preview_urls	2016-03-27 22:54:42 +01:00
__init__.py	Implement logout	2016-03-11 16:27:50 +00:00