Merge branch 'dinsic-release-v1.12.x' of github.com:matrix-org/synapse-dinsic into dinsic-release-v1.12.x
* 'dinsic-release-v1.12.x' of github.com:matrix-org/synapse-dinsic:
This commit is contained in:
* 'dinsic-release-v1.12.x' of github.com:matrix-org/synapse-dinsic: