Merge branch 'master' into develop

This commit is contained in:
manuroe
2021-09-30 23:51:17 +01:00
12 changed files with 78 additions and 49 deletions
@@ -20,7 +20,7 @@ struct RoomAvatarViewData: AvatarViewDataProtocol {
let roomId: String
let displayName: String?
let avatarUrl: String?
let mediaManager: MXMediaManager
let mediaManager: MXMediaManager?
var matrixItemId: String {
return roomId