diff options
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 412e850325..8641571986 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,16 @@ +<<<<<<< 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 |