Merge master and fix conflicts

1 files changed, 6 insertions, 0 deletions

diff --git a/src/EventAccessors.cpp b/src/EventAccessors.cpp

index 7f28eb46..a2d8adbb 100644
--- a/src/EventAccessors.cpp
+++ b/src/EventAccessors.cpp
@@ -400,3 +400,9 @@ mtx::accessors::media_width(const mtx::events::collections::TimelineEvents &even
 {
         return std::visit(EventMediaWidth{}, event);
 }
+
+nlohmann::json
+mtx::accessors::serialize_event(const mtx::events::collections::TimelineEvents &event)
+{
+        return std::visit([](const auto &e) { return nlohmann::json(e); }, event);
+}