mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-29 06:28:45 +03:00
8cf2a51588
Conflicts: vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt vector/src/main/res/layout/item_timeline_event_base.xml vector/src/main/res/layout/item_timeline_event_redacted_stub.xml |
||
---|---|---|
.. | ||
sampledata | ||
signature | ||
src | ||
.gitignore | ||
build.gradle | ||
lint.xml | ||
proguard-rules.pro |