SpiritCroc 4617d2d698 Merge tag 'v1.4.14' into sc ... v1.4.14 Change-Id: I3667009380f1e35ce05c75c3769e62e3446212db Conflicts: .editorconfig matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt 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/room/send/LocalEchoEventFactory.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt vector/src/main/java/im/vector/app/AppStateHandler.kt vector/src/main/java/im/vector/app/VectorApplication.kt vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt vector/src/main/java/im/vector/app/core/receiver/BackgroundSyncStarter.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt vector/src/main/java/im/vector/app/features/navigation/Navigator.kt vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.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/SpaceSummaryController.kt		2022-05-05 17:41:26 +02:00
..
androidTest/java/im/vector/app	Rename val	2022-05-04 17:51:14 +02:00
debug	Merge tag 'v1.4.14' into sc	2022-05-05 17:41:26 +02:00
fdroid/java/im/vector/app	Merge tag 'v1.4.14' into sc	2022-05-05 17:41:26 +02:00
gplay	Merge tag 'v1.4.14' into sc	2022-05-05 17:41:26 +02:00
main	Merge tag 'v1.4.14' into sc	2022-05-05 17:41:26 +02:00
release	Different app icon background for debug builds	2022-04-04 12:44:42 +02:00
sharedTest/java/im/vector/app/test/shared
test/java/im/vector/app	Fix test	2022-05-03 17:43:00 +02:00