diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-04-03 11:29:43 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-04-03 11:29:43 +0100 |
commit | 6dd6a3557c3ac0d515145ba0b5ab3a4b24bb4c03 (patch) | |
tree | 01b0b3bf33e8a964df23b63a49547e2e8c664bff /CHANGES.md | |
parent | Fix device list update stream ids going backward (#7158) (diff) | |
parent | Revert "Revert "Merge pull request #7153 from matrix-org/babolivier/sso_white... (diff) | |
download | synapse-6dd6a3557c3ac0d515145ba0b5ab3a4b24bb4c03.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'CHANGES.md')
-rw-r--r-- | CHANGES.md | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md index ee28080e38..bee4d6baba 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,23 @@ Next version configuration then this template will need to be duplicated into that directory. +Synapse 1.12.3 (2020-04-03) +=========================== + +- Remove the the pin to Pillow 7.0 which was introduced in Synapse 1.12.2, and +correctly fix the issue with building the Debian packages. ([\#7212](https://github.com/matrix-org/synapse/issues/7212)) + +Synapse 1.12.2 (2020-04-02) +=========================== + +This release works around [an +issue](https://github.com/matrix-org/synapse/issues/7208) with building the +debian packages. + +No other significant changes since 1.12.1. + +>>>>>>> master + Synapse 1.12.1 (2020-04-02) =========================== |