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
..
src	Merge branch 'develop' into suspend_functions_1	2021-04-10 16:50:30 +01:00
.gitignore	first commit	2018-10-03 17:58:12 +02:00
build.gradle	Bump daggerVersion from 2.33 to 2.34	2021-04-08 07:19:20 +00:00
lint.xml	Set severity of ObsoleteSdkInt to error	2020-08-18 00:46:37 +02:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00