SpiritCroc abdc558c07 Merge tag 'v1.6.16' into sc ... Change-Id: I690d21f0bac84dfed5d6f87e9c1aa30c78c8d346 Conflicts: dependencies_groups.gradle vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt		2024-05-30 20:16:19 +02:00
..
src/main	Merge tag 'v1.6.16' into sc	2024-05-30 20:16:19 +02:00
.gitignore
build.gradle	Bump gradle from 7.2.2 to 7.3.1 (#7364)	2022-10-17 09:14:28 +02:00
consumer-rules.pro
proguard-rules.pro