SchildiChat-android/matrix-sdk-android
SpiritCroc bb6595110b Merge tag 'v1.5.0' into merge-v1.5.0
Change-Id: Ifaa56941340ac1774d8b7bd470e32c5203d15f69

Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
	vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteEmojiDataItem.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/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/menu/menu_new_home.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2022-09-23 16:28:00 +02:00
..
docs Package have been renamed, so also rename it here. 2022-05-20 21:14:42 +02:00
src Merge tag 'v1.5.0' into merge-v1.5.0 2022-09-23 16:28:00 +02:00
.gitignore
build.gradle Version++ 2022-09-10 08:15:31 +02:00
proguard-rules.pro