diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-04-08 17:41:46 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-04-08 17:41:46 +0100 |
| commit | 24722de7c86408053551dcd0bb9fb1c5397a9c0d (patch) | |
| tree | 68a8e1af4527b2f872451e16e92286e24d50487c | |
| parent | Remove redundant checks on `daemonize` from synctl (#7233) (diff) | |
| download | synapse-24722de7c86408053551dcd0bb9fb1c5397a9c0d.tar.xz | |
Fix bad merge of CHANGES.md
Diffstat (limited to '')
| -rw-r--r-- | CHANGES.md | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/CHANGES.md b/CHANGES.md index bee4d6baba..96021a5e69 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,14 +15,10 @@ correctly fix the issue with building the Debian packages. ([\#7212](https://git 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. +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) =========================== |