summary refs log tree commit diff
path: root/debian/changelog
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-07-25 15:19:22 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-07-25 15:19:22 +0100
commitf16aa3a44ba4198af05b5419c77e37eb85c94b64 (patch)
tree9032b35f9279951971a6163155cda4e0afde4803 /debian/changelog
parentMerge tag 'v1.2.0rc2' into develop (diff)
parent1.2.0 (diff)
downloadsynapse-f16aa3a44ba4198af05b5419c77e37eb85c94b64.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog7
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 8aba444f1d..aafdd1cde2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-matrix-synapse-py3 (1.1.0-1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.2.0) stable; urgency=medium
 
   [ Amber Brown ]
   * Update logging config defaults to match API changes in Synapse.
@@ -6,7 +6,10 @@ matrix-synapse-py3 (1.1.0-1) UNRELEASED; urgency=medium
   [ Richard van der Hoff ]
   * Add Recommends and Depends for some libraries which you probably want.
 
- -- Erik Johnston <erikj@rae>  Thu, 04 Jul 2019 13:59:02 +0100
+  [ Synapse Packaging team ]
+  * New synapse release 1.2.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 25 Jul 2019 14:10:07 +0100
 
 matrix-synapse-py3 (1.1.0) stable; urgency=medium