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
..
2022-05-20 21:14:42 +02:00
2022-12-30 17:58:06 +01:00
2022-12-20 16:50:08 +01:00
2021-01-05 18:56:24 +01:00