38c8e30541
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 |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||