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
..
java/im/vector/app	Reformats project based on editorconfig	2022-05-05 19:10:35 +02:00
res	Different app icon background for debug builds	2022-04-04 12:44:42 +02:00
AndroidManifest.xml	moving the live location sharing permission debug only to unblock releases whilst the feature is WIP	2022-03-25 15:07:06 +00:00