Dominic Fischer 7ee87a0d4b Merge branch 'develop' into suspend_functions_1 ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt		2021-04-10 16:50:30 +01:00
..
matrix/android/sdk	Merge branch 'develop' into suspend_functions_1	2021-04-10 16:50:30 +01:00