mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-24 10:25:51 +03:00
19881a9f70
Change-Id: Ic5e1c79d3c39476375bf795bb7a1abb67c664f94 Conflicts: dependencies.gradle vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml |
||
---|---|---|
.. | ||
docs | ||
src | ||
.gitignore | ||
build.gradle | ||
proguard-rules.pro |