Erik Johnston 4dd0604f61 Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes		2018-08-15 15:37:05 +01:00
..
client	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	2018-08-15 15:37:05 +01:00
media	Run black.	2018-08-10 23:54:09 +10:00
__init__.py	copyrights	2016-01-07 04:26:29 +00:00