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
..
sampledata	Add required resources.	2022-05-27 15:25:59 +03:00
src	Merge remote-tracking branch 'upstream/develop' into sc	2022-12-07 14:56:07 +01:00
.gitignore	…
build.gradle	Merge remote-tracking branch 'upstream/develop' into sc	2022-12-07 14:56:07 +01:00