Benoit Marty f75a2cc12c 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
..
src/main/kotlin/io/element/android/features/roomdetails/api	Merge branch 'develop' into feature/bma/mediaForward	2025-10-29 12:41:58 +01:00
.gitignore
build.gradle.kts	Apply dual licenses: AGPL + Element Commercial to file headers.	2025-01-07 10:05:04 +01:00