mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 09:30:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/fastlane/metadata/android/sq/changelogs
History
SpiritCroc 978056e01f Merge tag 'v1.3.4' into sc 
Conflicts:
	dependencies.gradle
	gradle.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
	vector/build.gradle
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	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/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt

Parts of conflict resolution taken from

    commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
    Merge: 06f52832b 1f74bc986
    Author: S1m <git@sgougeon.fr>
    Date:   Fri Oct 15 09:36:46 2021 +0200

        Merge remote-tracking branch 'upstream/develop' into unifiedpush

Change-Id: I25ad98c59df8b8057147260d790eb2a86d6a6e9b
2021-10-21 17:31:11 +02:00
..
40100100.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40100110.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40100120.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40100130.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40100140.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40100150.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40100160.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40100170.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101000.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101010.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101020.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101030.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101040.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101050.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101060.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101070.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101080.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101090.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101100.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101110.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101120.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101130.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101140.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101150.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40101160.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40102000.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40102010.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40103000.txt [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
40103030.txt Translated using Weblate (Albanian) 2021-10-18 01:25:54 +00:00