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