SpiritCroc 4f60963741 Merge tag 'v1.4.16' into sc ... Change-Id: Ibfb03ebf80dc1403fa438a390f609f2201602ba9 Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.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/timeline/DefaultTimeline.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt vector/src/main/res/drawable/ic_settings_root_flair.xml vector/src/main/res/layout/fragment_timeline.xml vector/src/main/res/xml/vector_settings_labs.xml		2022-05-18 09:59:01 +02:00
..
androidTest/java/im/vector/app	Make the constructor public	2022-05-16 12:23:10 +02:00
debug	Merge tag 'v1.4.16' into sc	2022-05-18 09:59:01 +02:00
fdroid/java/im/vector/app	Merge pull request #5941 from vector-im/feature/bma/konfetti_speed	2022-05-09 17:05:53 +02:00
gplay	unifiedpush/FCM: also allow FCM for SERVICE_VERSION_UPDATE_REQUIRED	2022-05-17 10:38:55 +02:00
main	Merge tag 'v1.4.16' into sc	2022-05-18 09:59:01 +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	Detekt: enable and fix EndOfSentenceFormat	2022-05-16 08:54:07 +02:00