SchildiChat-android/library/multipicker
SpiritCroc f5afdefe2f Merge tag 'v1.4.4' into sc
Change-Id: Ibfb35ec30a51abebb652044719417f62c8a6be50

Conflicts:
	library/ui-styles/src/main/res/values/dimens.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/res/drawable/bg_unread_notification.xml
	vector/src/main/res/drawable/ic_add_reaction_small.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2022-03-10 13:26:09 +01:00
..
src/main Merge tag 'v1.4.4' into sc 2022-03-10 13:26:09 +01:00
.gitignore moves multipicker module to library 2022-02-22 19:48:48 +01:00
build.gradle moves multipicker module to library 2022-02-22 19:48:48 +01:00
consumer-rules.pro moves multipicker module to library 2022-02-22 19:48:48 +01:00
proguard-rules.pro moves multipicker module to library 2022-02-22 19:48:48 +01:00