SpiritCroc 04f4e13230 Merge tag 'v1.0.17' into sc ... Conflicts: vector/build.gradle vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt Note: Upstream added their own "pass theme to widgets" implementation, which currently does not respect "black" themes (but treats them as "dark" themes). For now, let's integrate our own implementation into the new one. Change-Id: If99f2f87e20215595fc36996bb530bf5f247b0cb		2021-02-10 11:05:22 +01:00
..
fastlane/metadata/android	[TMP] Automatic upstream merge preparation	2021-02-10 10:07:21 +01:00
metadata/android	[TMP] Automatic upstream merge preparation	2021-02-10 10:07:21 +01:00