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

..

signature

Remove usage of Buildkite.

2022-11-24 14:49:55 +01:00

src

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

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

build.gradle

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

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

proguard-rules.pro

Apply design changes to WYSIWYG editor (#7354)

2022-10-14 09:59:43 +02:00