Matthew Hodgson 2e0d2879d0 Merge branch 'develop' into matrix-org-hotfixes		2018-09-26 11:00:26 +01:00
..
client	Merge branch 'develop' into matrix-org-hotfixes	2018-09-12 17:16:21 +01:00
consent	fix another consent encoding fail	2018-08-21 23:14:25 +01:00
key	Port rest/ to Python 3 (#3823)	2018-09-12 20:41:31 +10:00
media	Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches	2018-09-25 12:02:57 +01:00
__init__.py	Move v1-only APIs into their own module & isolate deprecated ones (#3460)	2018-07-19 20:03:33 +10:00