SchildiChat-android/matrix-sdk-android
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
..
src Merge tag 'v1.0.3' into sc 2020-07-31 11:22:57 +02:00
.gitignore first commit 2018-10-03 17:58:12 +02:00
build.gradle Fix "uploads don't work with Room v6" #1558 2020-07-17 20:33:47 +02:00
lint.xml Improve lint configuration 2019-04-03 12:04:24 +02:00
proguard-rules.pro Fix / Serialization issues 2020-07-02 19:26:05 +02:00