Erik Johnston f793ff4571 Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes		2018-07-17 10:04:33 +01:00
..
client	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	2018-07-17 10:04:33 +01:00
media	run isort	2018-07-09 16:09:20 +10:00
__init__.py	copyrights	2016-01-07 04:26:29 +00:00