mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-23 18:05:59 +03:00
27a6b3c79e
Merge v1.0.5 pt. 6 Conflicts: matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreMigration.kt matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryUpdater.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt |
||
---|---|---|
.. | ||
sampledata | ||
signature | ||
src | ||
.gitignore | ||
build.gradle | ||
lint.xml | ||
proguard-rules.pro |