Merge origin/master and fix conflicts

1 files changed, 2 insertions, 0 deletions

diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp

index f7f377fb..f4c927ac 100644
--- a/src/timeline/RoomlistModel.cpp
+++ b/src/timeline/RoomlistModel.cpp
@@ -533,6 +533,8 @@ RoomlistModel::initializeRooms()
         for (const auto &id : cache::client()->roomIds())
                 addRoom(id, true);
 
+        nhlog::db()->info("Restored {} rooms from cache", rowCount());
+
         endResetModel();
 }