filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
SchildiChat-android/fastlane/metadata/android
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
..
ar [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
bg [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
ca [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
cs-CZ [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
de-DE [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
en-US Merge tag 'v1.3.4' into sc 2021-10-21 17:31:11 +02:00
eo [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
es-ES [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
et Merge tag 'v1.3.4' into sc 2021-10-21 17:31:11 +02:00
fa Merge tag 'v1.3.4' into sc 2021-10-21 17:31:11 +02:00
fi-FI [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
fr-FR [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
fy [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
ga [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
hu-HU Merge tag 'v1.3.4' into sc 2021-10-21 17:31:11 +02:00
id Merge tag 'v1.3.4' into sc 2021-10-21 17:31:11 +02:00
it-IT [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
iw-IL [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
ja-JP [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
kab [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
nb [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
no-NO [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
pt-BR Merge tag 'v1.3.4' into sc 2021-10-21 17:31:11 +02:00
ro [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
ru-RU [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
si-LK [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
sk [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
sq Merge tag 'v1.3.4' into sc 2021-10-21 17:31:11 +02:00
sr [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
sv-SE [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
th [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
tr-TR [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
uk Merge tag 'v1.3.4' into sc 2021-10-21 17:31:11 +02:00
vi [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00
zh-CN Merge tag 'v1.3.4' into sc 2021-10-21 17:31:11 +02:00
zh-TW [TMP] Automatic upstream merge preparation 2021-10-21 16:27:34 +02:00