38b82fb823
Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.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/item/MessageTextItem.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt vector/src/main/res/drawable/ic_attachment.xml vector/src/main/res/layout/item_bottom_sheet_action.xml vector/src/main/res/layout/item_timeline_event_base.xml vector/src/main/res/layout/item_timeline_event_text_message_stub.xml vector/src/main/res/values-v23/theme_status.xml vector/src/main/res/values/array.xml vector/src/main/res/values/theme_status.xml Note to self: need to check if URL preview works with wrap_content Change-Id: I028b2873a33bb1a770f2da96d576b97202b5bcf9 |
||
|---|---|---|
| .. | ||
| codeStyles | ||
| copyright | ||
| dictionaries | ||