diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-30 17:55:06 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-30 17:55:06 +0100 |
| commit | 9605593d11b67199a98ed25f121a2af2e1c9587a (patch) | |
| tree | dc57897bfcbd1591fa0dfb219e376353584654e9 /synapse/api/events/factory.py | |
| parent | SYN-75 Verify signatures on server to server transactions (diff) | |
| parent | pyflakes cleanup (diff) | |
| download | synapse-9605593d11b67199a98ed25f121a2af2e1c9587a.tar.xz | |
Merge branch 'develop' into server2server_signing
Conflicts: synapse/storage/__init__.py tests/rest/test_presence.py
Diffstat (limited to 'synapse/api/events/factory.py')
| -rw-r--r-- | synapse/api/events/factory.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/api/events/factory.py b/synapse/api/events/factory.py index d3d96d73eb..0d94850cec 100644 --- a/synapse/api/events/factory.py +++ b/synapse/api/events/factory.py @@ -17,7 +17,8 @@ from synapse.api.events.room import ( RoomTopicEvent, MessageEvent, RoomMemberEvent, FeedbackEvent, InviteJoinEvent, RoomConfigEvent, RoomNameEvent, GenericEvent, RoomPowerLevelsEvent, RoomJoinRulesEvent, RoomOpsPowerLevelsEvent, - RoomCreateEvent, RoomAddStateLevelEvent, RoomSendEventLevelEvent + RoomCreateEvent, RoomAddStateLevelEvent, RoomSendEventLevelEvent, + RoomRedactionEvent, ) from synapse.util.stringutils import random_string @@ -39,6 +40,7 @@ class EventFactory(object): RoomAddStateLevelEvent, RoomSendEventLevelEvent, RoomOpsPowerLevelsEvent, + RoomRedactionEvent, ] def __init__(self, hs): |