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
..
2022-01-11 17:22:06 +01:00
2022-01-25 21:42:37 +01:00
2022-10-27 14:30:36 +01:00
2022-12-05 09:43:55 +01:00
2022-12-05 09:46:14 +01:00
2022-12-05 09:41:23 +01:00
2022-12-01 15:38:31 +01:00
2022-12-02 16:50:46 +01:00
2022-12-02 19:02:55 +03:00
2022-12-05 18:18:09 +03:00
2022-12-07 13:54:20 +01:00