SpiritCroc cbd22a1257 Merge commit 'a1f90abcd20d2100e02767a6fd2cfb9969f12a4d' into sc ... Merge v1.0.5 pt. 2 Conflicts: vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt vector/src/main/java/im/vector/app/core/ui/views/WrapWidthTextView.kt vector/src/main/java/im/vector/app/core/utils/UserColor.kt 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/RoomColor.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/timeline/item/AbsMessageItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.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/RedactedMessageItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListActivity.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt vector/src/main/java/im/vector/app/features/themes/BubbleThemeUtils.kt vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt vector/src/main/res/layout/fragment_login_server_selection.xml vector/src/main/res/layout/item_timeline_event_base.xml vector/src/main/res/layout/item_timeline_event_base_state.xml vector/src/main/res/xml/vector_settings_advanced_settings.xml vector/src/main/res/xml/vector_settings_preferences.xml		2020-08-22 10:29:31 +02: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 commit 'a1f90abcd20d2100e02767a6fd2cfb9969f12a4d' into sc	2020-08-22 10:29:31 +02:00
.gitignore	Update .gitignore for gplay builds	2020-08-09 17:02:51 +02:00
build.gradle	Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc	2020-08-22 09:52:54 +02:00
lint.xml	Try to remove rule that is breaking CI	2020-03-11 11:19:22 +01:00
proguard-rules.pro	Rename package im.vector.riotx to im.vector.app (IDE)	2020-08-03 18:46:29 +02:00