SchildiChat-android/vector
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
..
sampledata Add required resources. 2022-05-27 15:25:59 +03:00
src Merge tag 'v1.5.16' into sc 2022-12-30 17:58:06 +01:00
.gitignore
build.gradle Merge remote-tracking branch 'upstream/develop' into sc 2022-12-07 14:56:07 +01:00