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/im/vector/app	Fix test compilation	2021-02-18 15:36:51 +01:00
debug	Merge tag 'v1.1.0' into sc	2021-02-20 15:41:01 +01:00
fdroid	Rename parameters for clarity	2021-01-12 16:07:49 +01:00
gplay	Merge tag 'v1.0.12' into sc	2020-12-15 15:55:14 +01:00
main	Merge tag 'v1.1.0' into sc	2021-02-20 15:41:01 +01:00
release	Using ApplicationId from BuildConfig	2020-10-13 20:17:56 +02:00
sharedTest/java/im/vector/app/test/shared
test/java/im/vector/app