SpiritCroc c2e1a33864 Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc ... Merge v1.0.5 pt. 1 Conflicts: vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt vector/src/main/res/layout/fragment_login_server_selection.xml vector/src/main/res/values/theme_dark.xml vector/src/main/res/values/theme_light.xml		2020-08-22 09:52:54 +02:00
..
src	Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc	2020-08-22 09:52:54 +02:00
.gitignore
build.gradle	Fix "uploads don't work with Room v6" #1558	2020-07-17 20:33:47 +02:00
lint.xml
proguard-rules.pro	Fix / Serialization issues	2020-07-02 19:26:05 +02:00