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

1 files changed, 7 insertions, 0 deletions

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

index cf39bed907..b964cf90a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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 ]