filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
SchildiChat-android/matrix-sdk-android/src
History
SpiritCroc 58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/res/menu/menu_timeline.xml
 		2020-11-05 13:15:55 +01:00
..
androidTest/java/org/matrix/android/sdk Merge branch 'develop' into feature/ons/fix_markdown_formatter 2020-11-04 13:43:26 +03:00
debug/java/org/matrix/android/sdk/internal/network/interceptors Move RealmDebugTools and make it an internal class 2020-11-03 09:20:24 +01:00
main Merge remote-tracking branch 'upstream/master' into sc 2020-11-05 13:15:55 +01:00
release/java/org/matrix/android/sdk/internal/network/interceptors Fix Copyright mention in SDK code 2020-10-08 15:04:55 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared Fix Copyright mention in SDK code 2020-10-08 15:04:55 +02:00
test/java/org/matrix/android/sdk Replace deprecated shouldEqual and shouldEqualTo by shouldBeEqualTo 2020-10-12 22:30:18 +02:00