Merge branch 'anoa/self_signed_upgrade' of github.com:matrix-org/synapse into anoa/self_signed_upgrade

This commit is contained in:
Andrew Morgan 2019-02-05 16:53:05 +00:00
commit 56cb34ba8b