Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-25 15:08:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
7ee87a0d4b
element-android-Github/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk
History
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
..
account Merge branch 'develop' into feature/bma/fix_redirection 2021-02-19 14:43:01 +01:00
api Copyright 2021-03-22 18:29:06 +01:00
common Merge branch 'develop' into suspend_functions_1 2021-04-10 16:50:30 +01:00
internal Convert RoomService to suspend functions 2021-04-02 11:02:32 +01:00
session Cleanup the test 2021-03-31 11:26:23 +02:00
InstrumentedTest.kt Add ApiInterceptor.removeListener() 2021-03-22 18:09:42 +01:00
LiveDataTestObserver.java Fix Copyright mention in SDK code 2020-10-08 15:04:55 +02:00
MainThreadExecutor.java Fix Copyright mention in SDK code 2020-10-08 15:04:55 +02:00
SingleThreadCoroutineDispatcher.kt Fix Copyright mention in SDK code 2020-10-08 15:04:55 +02:00