diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-10-08 11:23:41 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-10-08 11:23:41 +0900 |
| commit | c0953cf02f18d3ce6d514af1d22b54a4612bd139 (patch) | |
| tree | ab5000146743da82e95d651f8d4128bd7355840c /events/event.cpp | |
| parent | ce1bbe88509715c9a35bb7aeeb5f20f0d4918ec4 (diff) | |
| parent | c9dc5e12b835425f1ba5c447ddb3c3394ccac93e (diff) | |
| download | libquotient-c0953cf02f18d3ce6d514af1d22b54a4612bd139.tar.gz libquotient-c0953cf02f18d3ce6d514af1d22b54a4612bd139.zip | |
Merge branch 'master' into kitsune-gtad
Diffstat (limited to 'events/event.cpp')
| -rw-r--r-- | events/event.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/events/event.cpp b/events/event.cpp index d718306d..304f2af6 100644 --- a/events/event.cpp +++ b/events/event.cpp @@ -26,7 +26,7 @@ #include "roomtopicevent.h" #include "typingevent.h" #include "receiptevent.h" -#include "unknownevent.h" +#include "encryptedevent.h" #include "logging.h" #include <QtCore/QJsonDocument> @@ -136,6 +136,7 @@ RoomEvent* RoomEvent::fromJson(const QJsonObject& obj) "m.room.canonical_alias", make<RoomCanonicalAliasEvent>, "m.room.member", make<RoomMemberEvent>, "m.room.topic", make<RoomTopicEvent>, + "m.room.encryption", make<EncryptionEvent>, /* Insert new ROOM event types BEFORE this line */ nullptr ); |