699ad4eaeb
Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt vector/src/main/res/drawable/rounded_rect_shape.xml vector/src/main/res/menu/menu_timeline.xml vector/src/main/res/values/array.xml vector/src/main/res/xml/vector_settings_preferences.xml |
||
|---|---|---|
| .. | ||
| androidTest/java/org/matrix/android/sdk | ||
| debug/java/org/matrix/android/sdk/internal/network/interceptors | ||
| main | ||
| release/java/org/matrix/android/sdk/internal/network/interceptors | ||
| sharedTest/java/org/matrix/android/sdk/test/shared | ||
| test/java/org/matrix/android/sdk | ||