Merge branch 'develop' into feature/bma/mediaForward

# Conflicts: # appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
2025-10-29 12:41:58 +01:00 · 2025-10-29 12:41:58 +01:00 · cc050a1f26
commit cc050a1f26
parent 725e6c9855 0bc71acd8a
43 changed files with 399 additions and 190 deletions
--- a/features/roomdetails/api/src/main/kotlin/io/element/android/features/roomdetails/api/RoomDetailsEntryPoint.kt
+++ b/features/roomdetails/api/src/main/kotlin/io/element/android/features/roomdetails/api/RoomDetailsEntryPoint.kt
@ -24,6 +24,9 @@ interface RoomDetailsEntryPoint : FeatureEntryPoint {
        @Parcelize
        data object RoomDetails : InitialTarget

+        @Parcelize
+        data object RoomMemberList : InitialTarget
+
        @Parcelize
        data class RoomMemberDetails(val roomMemberId: UserId) : InitialTarget