diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2020-05-19 09:56:15 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2020-05-19 09:56:15 -0400 |
| commit | 02919bf4d80a283af94f576c1c7fe76869e3965a (patch) | |
| tree | 9dabb44fc3c91b522ee92102346d7bef2ccde151 /debian/changelog | |
| parent | synctl warns when no process is stopped and avoids start (#6598) (diff) | |
| parent | Merge tag 'v1.13.0' (diff) | |
| download | synapse-02919bf4d80a283af94f576c1c7fe76869e3965a.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 8641571986..e7842d4174 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,18 @@ -<<<<<<< HEAD -matrix-synapse-py3 (1.12.3ubuntu1) UNRELEASED; urgency=medium +matrix-synapse-py3 (1.13.0) stable; urgency=medium + [ Patrick Cloke ] * Add information about .well-known files to Debian installation scripts. - -- Patrick Cloke <patrickc@matrix.org> Mon, 06 Apr 2020 10:10:38 -0400 -======= + [ Synapse Packaging team ] + * New synapse release 1.13.0. + + -- Synapse Packaging team <packages@matrix.org> Tue, 19 May 2020 09:16:56 -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 |