diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-12-10 16:21:00 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-12-10 16:21:00 +0000 |
| commit | d7ee7b589f0535c21301f38e93b0cabc0cf288d4 (patch) | |
| tree | fcd7d110dc66d5e175f1030d10e0bbd5624bbf3c /synapse/push/baserules.py | |
| parent | Don't complain if /make_join response lacks 'prev_state' list (SYN-517) (diff) | |
| parent | Merge pull request #432 from matrix-org/pushrules_refactor (diff) | |
| download | synapse-d7ee7b589f0535c21301f38e93b0cabc0cf288d4.tar.xz | |
Merge branch 'develop' into paul/tiny-fixes
Diffstat (limited to 'synapse/push/baserules.py')
| -rw-r--r-- | synapse/push/baserules.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py index 1f015a7f2e..7f76382a17 100644 --- a/synapse/push/baserules.py +++ b/synapse/push/baserules.py @@ -247,6 +247,7 @@ def make_base_append_underride_rules(user): }, { 'rule_id': 'global/underride/.m.rule.message', + 'enabled': False, 'conditions': [ { 'kind': 'event_match', |