Merge branch 'master' of github.com:matrix-org/synapse into develop

1 files changed, 11 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog

index bf5a59b335..b964cf90a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
-matrix-synapse-py3 (1.0.0+nmu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.1.0-1) UNRELEASED; urgency=medium
+
+  [ Amber Brown ]
+  * Update logging config defaults to match API changes in Synapse.
+
+ -- Erik Johnston <erikj@rae>  Thu, 04 Jul 2019 13:59:02 +0100
+
+matrix-synapse-py3 (1.1.0) stable; urgency=medium
 
   [ Silke Hofstra ]
   * Include systemd-python to allow logging to the systemd journal.
 
-  [ Amber Brown ]
-  * Update logging config defaults to match API changes in Synapse.
+  [ Synapse Packaging team ]
+  * New synapse release 1.1.0.
 
- -- Silke Hofstra <silke@slxh.eu>  Wed, 29 May 2019 09:45:29 +0200
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 04 Jul 2019 11:43:41 +0100
 
 matrix-synapse-py3 (1.0.0) stable; urgency=medium