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	Merge remote-tracking branch 'upstream/develop' into sc	2022-12-07 14:56:07 +01:00
.gitignore	Create module for ui-styles	2021-06-15 12:23:54 +02:00
build.gradle	Merge tag 'v1.5.4' into merge-v1.5.4	2022-10-28 18:02:53 +02:00