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
..
sampledata	Room profile: make link in room topic clickable	2020-01-16 16:36:56 +01:00
signature	Share the debug signature to all machines which build the debug APK	2019-06-07 10:17:14 +02:00
src	Merge tag 'v1.1.0' into sc	2021-02-20 15:41:01 +01:00
.gitignore	Update .gitignore for gplay builds	2020-08-09 17:02:51 +02:00
build.gradle	Merge tag 'v1.1.0' into sc	2021-02-20 15:41:01 +01:00
lint.xml	Do not let ContentDescription lint issue appear again	2021-02-12 20:18:34 +01:00
proguard-rules.pro	Initial commit jitsi	2020-08-14 09:31:24 +02:00