Merge branch 'master' of github.com:matrix-org/synapse into develop

pull/3150/head
Erik Johnston 2018-04-27 13:28:51 +01:00
commit d2737c1fae

Diff Content Not Available