Erik Johnston 9f2d14ee26 Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes		2018-10-26 09:52:23 +01:00
..
client	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	2018-10-26 09:52:23 +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	Fix a number of flake8 errors	2018-10-24 10:39:03 +01:00
__init__.py	make it work and fix pep8	2018-08-12 19:13:09 -04:00