David Baker d72ce4da64 Merge branch 'develop' of github.com:matrix-org/synapse into develop ... Conflicts: synapse/http/client.py		2014-09-03 18:25:17 +01:00
..
fileInput	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
fileUpload	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
matrix	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2014-09-03 18:25:17 +01:00
utilities	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00