Merge branch 'client_server/r0.3.0_updates'

7 years ago · 4adeb0d6fe
parent 93d7bbc8bf 20ebae4bd3
commit 4adeb0d6fe
1 changed files with 2 additions and 2 deletions
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@ -8,8 +8,8 @@ r0.3.0

 - Breaking changes:

-  - Change the rule kind of `.m.rule.contains_display_name` from
-    `underride` to `override`. This works with all known clients
+  - 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