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
..
sampledata
signature
src	Merge branch 'develop' into suspend_functions_1	2021-04-10 16:50:30 +01:00
.gitignore
build.gradle	Merge pull request #3148 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-21.1.0	2021-04-09 16:39:05 +02:00
lint.xml	Fix issue with Locale folder.	2021-03-10 21:54:11 +01:00
proguard-rules.pro