Merge master and fix conflicts

1 files changed, 8 insertions, 0 deletions

diff --git a/src/CacheStructs.h b/src/CacheStructs.h

index 28c70055..4a5c5c76 100644
--- a/src/CacheStructs.h
+++ b/src/CacheStructs.h
@@ -11,6 +11,7 @@
 #include <string>
 
 #include <mtx/events/join_rules.hpp>
+#include <mtx/events/mscs/image_packs.hpp>
 
 namespace cache {
 enum class CacheVersion : int
@@ -109,3 +110,10 @@ struct RoomSearchResult
         std::string room_id;
         RoomInfo info;
 };
+
+struct ImagePackInfo
+{
+        mtx::events::msc2545::ImagePack pack;
+        std::string source_room;
+        std::string state_key;
+};