Erik Johnston bcfb653816 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search		2015-10-15 16:37:32 +01:00
..
client	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	2015-10-15 16:37:32 +01:00
key	…
media	Merge branch 'release-v0.10.0' into develop	2015-08-28 11:15:27 +01:00
__init__.py	…