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
..
attachment-viewer	Merge tag 'v1.5.24' into sc	2023-02-08 13:08:42 +01:00
core-utils	Merge tag 'v1.5.26' into sc	2023-02-23 11:55:21 +01:00
external	Bump gradle from 7.2.2 to 7.3.1 (#7364)	2022-10-17 09:14:28 +02:00
multipicker	Merge tag 'v1.5.4' into merge-v1.5.4	2022-10-28 18:02:53 +02:00
ui-strings	Merge tag 'v1.5.26' into sc	2023-02-23 11:55:21 +01:00
ui-styles	Merge tag 'v1.5.24' into sc	2023-02-08 13:08:42 +01:00