From 9fb68f54cec79372c968b301ae1c4824c406f2f3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 Aug 2016 18:16:47 +0100
Subject: [PATCH] Changelog

---
 changelogs/client_server.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index ba0a4ecf..085d6245 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -1,6 +1,13 @@
 <Unreleased changes>
 ====================
 
+- Breaking changes:
+  - Change the rule kind of `.m.rule.contains_display_name` from
+    `underride` to `override`. This works with all known clients
+    which support push rules, but any other clients implementing
+    the push rules API should be aware of this change. This
+    makes it simple to mute rooms correctly in the API.
+
 - Spec clarifications:
 
   - Spell out the way that state is handled by ``POST /createRoom``