SpiritCroc 87100a8536 Merge remote-tracking branch 'upstream/develop' into sc ...

Change-Id: Ifed09540802774e7b1d3f2ab787a7f42f1030b28

Conflicts:
	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt

2022-12-07 14:56:07 +01:00

..

attachment-viewer

Merge tag 'v1.5.8' into sc

2022-11-18 16:11:16 +01:00

core-utils

Merge tag 'v1.5.8' into sc

2022-11-18 16:11:16 +01:00

external

Bump gradle from 7.2.2 to 7.3.1 (#7364)

2022-10-17 09:14:28 +02:00

multipicker

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

2022-10-28 18:02:53 +02:00

ui-strings

Merge remote-tracking branch 'upstream/develop' into sc

2022-12-07 14:56:07 +01:00

ui-styles

Merge remote-tracking branch 'upstream/develop' into sc

2022-12-07 14:56:07 +01:00