Erik Johnston 2f141f4c41 Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes		2018-08-22 11:47:08 +01:00
..
client	Bugfixes	2018-08-21 19:12:14 +00:00
consent	fix another consent encoding fail	2018-08-21 23:14:25 +01:00
key	run isort	2018-07-09 16:09:20 +10:00
media	Port over enough to get some sytests running on Python 3 (#3668)	2018-08-20 23:54:49 +10:00
__init__.py	Move v1-only APIs into their own module & isolate deprecated ones (#3460)	2018-07-19 20:03:33 +10:00