SpiritCroc fe785613e7 Merge tag 'v1.5.2' into sc ...

Change-Id: I0fe8262be9f2e5852815ad5f93329ffa17970b0e

Conflicts:
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
	vector/src/main/res/layout/composer_layout.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml

2022-10-07 20:32:26 +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.2' into sc

2022-10-07 20:32:26 +02:00

.gitignore

…

build.gradle

version 1.5.1

2022-09-28 16:28:43 +02:00

proguard-rules.pro

Remove dependency to org.greenrobot.eventbus library

2021-01-05 18:56:24 +01:00