diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-05-19 13:48:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 13:48:41 +0100 |
| commit | 1fc8914f767f5f80d7263d8db96d73bf0310a39c (patch) | |
| tree | 2dfdeddbef624033b1d0dc87e9ac24851bb0e801 /debian/changelog | |
| parent | 1.13.0rc3 (diff) | |
| download | synapse-1fc8914f767f5f80d7263d8db96d73bf0310a39c.tar.xz | |
update dh-virtualenv (#7526)
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 8641571986..2db94ee609 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,14 @@ -<<<<<<< HEAD matrix-synapse-py3 (1.12.3ubuntu1) UNRELEASED; urgency=medium * Add information about .well-known files to Debian installation scripts. -- Patrick Cloke <patrickc@matrix.org> Mon, 06 Apr 2020 10:10:38 -0400 -======= + matrix-synapse-py3 (1.12.4) stable; urgency=medium * New synapse release 1.12.4. -- Synapse Packaging team <packages@matrix.org> Thu, 23 Apr 2020 10:58:14 -0400 ->>>>>>> master matrix-synapse-py3 (1.12.3) stable; urgency=medium |