SpiritCroc 699ad4eaeb Merge tag 'v1.1.1' into sc ... 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		2021-03-14 10:58:57 +01:00
..
codeStyles	revert change from AS	2020-10-13 22:15:23 +02:00
copyright	Share the same Copyright header. Disabled for XML files	2020-02-05 17:48:59 +01:00
dictionaries	Improve Snackbar duration (Fixes #2929)	2021-03-10 14:49:52 +01:00