SchildiChat-android/matrix-sdk-android/src
SpiritCroc 9f7bf14a22 Merge tag 'v1.0.3' into sc
1.0.3

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/values/styles_login.xml
2020-07-31 11:22:57 +02:00
..
androidTest/java/im/vector/matrix/android Rework a bit user account data (and avoid blocking syncs) 2020-07-20 19:52:24 +02:00
debug/java/im/vector/matrix/android/internal
main Merge tag 'v1.0.3' into sc 2020-07-31 11:22:57 +02:00
release/java/im/vector/matrix/android/internal/network/interceptors
sharedTest/java/im/vector/matrix/android/test/shared
test/java/im/vector/matrix/android