SpiritCroc ca0b360875 Merge tag 'v1.1.0' into sc ... Change-Id: I73be281134a8a7ea7fdeffa9356ffae0dda8b0d6 Conflicts: vector/build.gradle vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/AbsBaseMessageItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt vector/src/main/res/drawable/oval_positive.xml vector/src/main/res/layout/composer_layout_constraint_set_compact.xml vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml vector/src/main/res/layout/dialog_disclaimer_content.xml vector/src/main/res/layout/fragment_login_splash.xml vector/src/main/res/layout/item_generic_with_value.xml vector/src/main/res/layout/item_timeline_event_media_message_stub.xml vector/src/main/res/menu/menu_timeline.xml vector/src/main/res/values/array.xml		2021-02-20 15:41:01 +01:00
..
androidTest/java/org/matrix/android/sdk	Merge branch 'develop' into feature/bma/fix_redirection	2021-02-19 14:43:01 +01:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Move interface to correct location	2021-01-07 18:28:05 +01:00
main	Merge tag 'v1.1.0' into sc	2021-02-20 15:41:01 +01:00
release/java/org/matrix/android/sdk/internal/network/interceptors	Fix Copyright mention in SDK code	2020-10-08 15:04:55 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared	Fix Copyright mention in SDK code	2020-10-08 15:04:55 +02:00
test/java/org/matrix/android/sdk	Small formatting	2021-01-08 15:55:32 +01:00