summary refs log tree commit diff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2017-01-05 13:50:22 +0000
committerMark Haines <mark.haines@matrix.org>2017-01-05 13:50:22 +0000
commitc18f7fc41019be6a5c08df3f4976bd94435677c7 (patch)
tree9c004496a373170c4468a38cc53e4e328f7a0b18 /CHANGES.rst
parentMerge pull request #1767 from matrix-org/matthew/resolve_state_group_logging (diff)
downloadsynapse-c18f7fc41019be6a5c08df3f4976bd94435677c7.tar.xz
Fix flake8 and update changelog v0.18.6-rc3
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 82c8e38cc5..c1a8dd7613 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -11,7 +11,7 @@ Bug fixes:
 
 Changes:
 
-* Improve logging for debugging deadlocks (PR #1766)
+* Improve logging for debugging deadlocks (PR #1766, PR #1767)
 
 Changes in synapse v0.18.6-rc2 (2016-12-30)
 ===========================================