SpiritCroc dec61e7a35 Merge tag 'v1.4.28' into merge-v1.4.28 ...

Change-Id: I623898b2034f132f23d2ac2dfeedb02fee16cd10

Conflicts:
	fastlane/README.md
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.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/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt

2022-07-17 18:52:55 +02:00

..

attachment-viewer

Merge tag 'v1.4.27-RC2' into merge-v1.4.27

2022-07-09 18:16:33 +02:00

core-utils

Merge tag 'v1.4.18' into sc

2022-06-01 13:54:34 +02:00

diff-match-patch

Global import optimization

2022-04-12 16:06:27 +02:00

jsonviewer

removing no longer needed butterknife dependency

2022-06-29 17:22:57 +01:00

multipicker

Merge tag 'v1.4.28' into merge-v1.4.28

2022-07-17 18:52:55 +02:00

ui-styles

Merge tag 'v1.4.28' into merge-v1.4.28

2022-07-17 18:52:55 +02:00