SpiritCroc 25dddf7566 Merge tag 'v1.5.16' into sc ... Change-Id: I98c122b95dd3758d41f4845a42ec9ed2371e174f Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt		2022-12-30 17:58:06 +01:00
..
src/main	Merge tag 'v1.5.16' into sc	2022-12-30 17:58:06 +01:00
build.gradle	Bump gradle from 7.2.2 to 7.3.1 (#7364)	2022-10-17 09:14:28 +02:00