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
..
src/main	Merge remote-tracking branch 'upstream/develop' into sc	2022-12-07 14:56:07 +01:00
.gitignore	Create module vector-config	2022-02-23 18:08:04 +01:00
build.gradle	Bump gradle from 7.2.2 to 7.3.1 (#7364)	2022-10-17 09:14:28 +02:00