diff options
author | Erik Johnston <erik@matrix.org> | 2015-10-20 16:57:51 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-10-20 16:57:51 +0100 |
commit | 44e2933bf87d278ef0d860ee04e61ecac9744480 (patch) | |
tree | c6a15fc8843f99a9f9ce0e47ab2b4254f5d285e4 /synapse/events | |
parent | Explicitly check for Sqlite3Engine (diff) | |
parent | Docstring (diff) | |
download | synapse-44e2933bf87d278ef0d860ee04e61ecac9744480.tar.xz |
Merge branch 'erikj/filter_refactor' into erikj/search
Diffstat (limited to 'synapse/events')
-rw-r--r-- | synapse/events/utils.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py index b36eec0993..48548f8c40 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -66,7 +66,6 @@ def prune_event(event): "users_default", "events", "events_default", - "events_default", "state_default", "ban", "kick", |