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
..
src	Merge tag 'v1.3.4' into sc	2021-10-21 17:31:11 +02:00
.gitignore	first commit	2018-10-03 17:58:12 +02:00
build.gradle	Merge tag 'v1.3.4' into sc	2021-10-21 17:31:11 +02:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00