Merge branch 'develop' into feature/fga/media_viewer_actions

2023-06-06 14:35:25 +02:00 · 2023-06-06 14:35:25 +02:00 · 438fc6bb99
commit 438fc6bb99
parent 950e474c72 7308428596
408 changed files with 3011 additions and 2886 deletions
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
@ -51,6 +51,7 @@ class FakeMatrixRoom(
    override val alternativeAliases: List<String> = emptyList(),
    override val isPublic: Boolean = true,
    override val isDirect: Boolean = false,
+    override val joinedMemberCount: Long = 123L,
    private val matrixTimeline: MatrixTimeline = FakeMatrixTimeline(),
 ) : MatrixRoom {