mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-21 17:05:39 +03:00
21eec091f8
Change-Id: Ifc8466ddf92154fb9be05b372f234ffe26da47ba Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt |
||
---|---|---|
.. | ||
sampledata | ||
src | ||
.gitignore | ||
build.gradle |