mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2025-03-23 22:39:02 +03:00
Conflicts: vector/build.gradle vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt vector/src/main/res/drawable/bg_login_server.xml vector/src/main/res/drawable/bg_login_server_checked.xml vector/src/main/res/layout/fragment_login_server_selection.xml |
||
---|---|---|
.. | ||
sampledata | ||
signature | ||
src | ||
.gitignore | ||
build.gradle | ||
lint.xml | ||
proguard-rules.pro |