mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-24 18:36:21 +03:00
d9a5991559
Change-Id: If3e3927755638ee38d8817f8504f09b0df14f309 Conflicts: dependencies.gradle vector/src/fdroid/AndroidManifest.xml vector/src/gplay/AndroidManifest.xml vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt |
||
---|---|---|
.. | ||
src/main | ||
.gitignore | ||
build.gradle | ||
consumer-rules.pro | ||
proguard-rules.pro |