SpiritCroc 0b4f56d7a0 Merge remote-tracking branch 'upstream/master' into sc ... Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c Conflicts: gradle/wrapper/gradle-wrapper.properties vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt vector/src/main/res/layout/fragment_known_users.xml vector/src/main/res/layout/fragment_user_list.xml		2020-11-29 12:51:43 +01:00
..
wrapper	Merge remote-tracking branch 'upstream/master' into sc	2020-11-29 12:51:43 +01:00