# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1510055863 -3600
#      Tue Nov 07 12:57:43 2017 +0100
# Branch stable
# Node ID d56b8f5f0bb18b86928a0d205bea257cd105c161
# Parent  3afe20410b553736f09100f2e5df93aeb1eaef4d
changelog: add details about the pushkey related fix

diff --git a/CHANGELOG b/CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,10 @@
   * obsdiscovery: allow the config option to disable discovery server side
     (it was previously only honored on the client side)
 
+  * server: avoid exposing 'abort' to evolution enabled client talking
+            to server with the extension bu obsolescence marker exchange
+            disabled.
+
 7.0.0 -- 2017-10-23
 -------------------