SpiritCroc 44d3c0118a Merge remote-tracking branch 'upstream/master' into sc ... Change-Id: If0e38334e7e479134cd05283f857e4871bb7692f Conflicts: vector/build.gradle vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.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/item/MessageInformationData.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt vector/src/main/res/drawable/ic_settings_root_advanced.xml vector/src/main/res/drawable/ic_settings_root_call.xml vector/src/main/res/drawable/ic_settings_root_flair.xml vector/src/main/res/drawable/ic_settings_root_general.xml vector/src/main/res/drawable/ic_settings_root_help_about.xml vector/src/main/res/drawable/ic_settings_root_ignored_users.xml vector/src/main/res/drawable/ic_settings_root_labs.xml vector/src/main/res/drawable/ic_settings_root_legacy.xml vector/src/main/res/drawable/ic_settings_root_notification.xml vector/src/main/res/drawable/ic_settings_root_preferences.xml vector/src/main/res/drawable/ic_settings_root_security_privacy.xml vector/src/main/res/layout/fragment_home_drawer.xml vector/src/main/res/layout/fragment_login_splash.xml vector/src/main/res/layout/item_bottom_sheet_action.xml vector/src/main/res/layout/item_timeline_event_poll_stub.xml vector/src/main/res/layout/item_timeline_event_redacted_stub.xml vector/src/main/res/layout/view_avatar_selector.xml		2020-10-17 15:28:18 +02:00
..
src	Merge remote-tracking branch 'upstream/master' into sc	2020-10-17 15:28:18 +02:00
.gitignore
build.gradle	Trick to fix a change due to upgrade to build-tools 4.1.0 (?)	2020-10-13 23:05:33 +02:00
lint.xml	Set severity of ObsoleteSdkInt to error	2020-08-18 00:46:37 +02:00
proguard-rules.pro	Fix / Serialization issues	2020-07-02 19:26:05 +02:00