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
..
androidTest	Fix some ktlint issues, ignore some others	2022-03-28 18:22:04 +02:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Big annoying commit: execute command ./gradlew ktlintFormat - Fix "colon-spacing"	2021-10-01 13:31:15 +02:00
main	Merge tag 'v1.4.11' into sc	2022-04-12 11:57:16 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors	Big annoying commit: execute command ./gradlew ktlintFormat - Fix "colon-spacing"	2021-10-01 13:31:15 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared	Fix Copyright mention in SDK code	2020-10-08 15:04:55 +02:00
test/java/org/matrix/android/sdk	runBlocking -> runTest	2022-03-22 16:52:18 +01:00