MatrixSynapse

mirror of https://github.com/matrix-org/synapse

Author	SHA1	Message	Date
David Baker	5c6189ea3e	Merge branch 'develop' into pushers Conflicts: synapse/rest/__init__.py	2015-01-22 17:46:16 +00:00