mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-22 01:15:54 +03:00
9f7bf14a22
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 |
||
---|---|---|
.. | ||
src | ||
.gitignore | ||
build.gradle | ||
lint.xml | ||
proguard-rules.pro |