diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-07-01 11:08:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 11:08:25 +0100 |
| commit | 74d3e177f0443f27e670f0b99299d715c58fd238 (patch) | |
| tree | b55a6e76b5a06f031f3f331875ad7ccd6be3286e /synapse/rest | |
| parent | Additional configuration options for auto-join rooms (#7763) (diff) | |
| download | synapse-74d3e177f0443f27e670f0b99299d715c58fd238.tar.xz | |
Back out MSC2625 implementation (#7761)
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v1/push_rule.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/push_rule.py b/synapse/rest/client/v1/push_rule.py index f563b3dc35..9fd4908136 100644 --- a/synapse/rest/client/v1/push_rule.py +++ b/synapse/rest/client/v1/push_rule.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014-2020 The Matrix.org Foundation C.I.C. +# Copyright 2014-2016 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -267,7 +267,7 @@ def _check_actions(actions): raise InvalidRuleException("No actions found") for a in actions: - if a in ["notify", "dont_notify", "coalesce", "org.matrix.msc2625.mark_unread"]: + if a in ["notify", "dont_notify", "coalesce"]: pass elif isinstance(a, dict) and "set_tweak" in a: pass |