SchildiChat-android/library/multipicker/src/main
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
..
java/im/vector/lib/multipicker Merge tag 'v1.4.28' into merge-v1.4.28 2022-07-17 18:52:55 +02:00
res/xml moves multipicker module to library 2022-02-22 19:48:48 +01:00
AndroidManifest.xml moves multipicker module to library 2022-02-22 19:48:48 +01:00