Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup

1 files changed, 6 insertions, 0 deletions

diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py

index 186281dfa3..0832c77cb4 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -173,6 +173,12 @@ BASE_APPEND_UNDERRIDE_RULES = [
                 'kind': 'room_member_count',
                 'is': '2',
                 '_id': 'member_count',
+            },
+            {
+                'kind': 'event_match',
+                'key': 'type',
+                'pattern': 'm.room.message',
+                '_id': '_message',
             }
         ],
         'actions': [