SpiritCroc 38c8e30541 Merge tag 'v1.5.26' into sc ... Change-Id: Ie54ce4c15b4b95f7ecb4419f421762d7c57c5c2d Conflicts: dependencies.gradle 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/home/room/detail/TimelineViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt vector/src/main/res/drawable/ic_composer_rich_text_editor_close.xml vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml vector/src/main/res/drawable/ic_rich_composer_add.xml vector/src/main/res/drawable/ic_rich_composer_send.xml		2023-02-23 11:55:21 +01:00
..
sampledata	Add required resources.	2022-05-27 15:25:59 +03:00
src	Merge tag 'v1.5.26' into sc	2023-02-23 11:55:21 +01:00
.gitignore
build.gradle	Merge tag 'v1.5.26' into sc	2023-02-23 11:55:21 +01:00