SpiritCroc 7c35f5fda5 Merge tag 'v1.4.11' into sc ... Change-Id: I454f1ec4f1df6366065d5690d9704eb1bd573c2d Conflicts: dependencies_groups.gradle library/ui-styles/build.gradle matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt vector/src/main/AndroidManifest.xml vector/src/main/assets/open_source_licenses.html vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.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/item/MessageVoiceItem.kt vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt vector/src/main/res/menu/menu_timeline.xml		2022-04-12 11:57:16 +02:00
..
attachment-viewer	Merge tag 'v1.4.4' into sc	2022-03-10 13:26:09 +01:00
core-utils	[merge] Further merge fixups	2022-01-29 15:56:13 +01:00
diff-match-patch	moves diff-match-patch module to library	2022-02-22 19:40:17 +01:00
jsonviewer	Format file (no other change)	2022-03-22 16:13:06 +01:00
multipicker	Merge tag 'v1.4.4' into sc	2022-03-10 13:26:09 +01:00
ui-styles	Merge tag 'v1.4.11' into sc	2022-04-12 11:57:16 +02:00