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
..
src	Merge tag 'v1.0.17' into sc	2021-02-10 11:05:22 +01:00
.gitignore
build.gradle	Merge pull request #2616 from vector-im/feature/ons/android_11_migration	2021-01-22 17:17:04 +01:00
lint.xml	Set severity of ObsoleteSdkInt to error	2020-08-18 00:46:37 +02:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00