SpiritCroc 2e9195df2b Merge remote-tracking branch 'upstream/master' into sc_1.0.7 ... Change-Id: Iccb1b1f0bee6b77c9f15d917c8073910841b6ff8 Conflicts: vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt		2020-09-17 12:03:17 +02:00
..
src	Merge remote-tracking branch 'upstream/master' into sc_1.0.7	2020-09-17 12:03:17 +02:00
.gitignore	…
build.gradle	Support for image compression on Android 10	2020-09-04 09:36:18 +02:00
lint.xml	Set severity of ObsoleteSdkInt to error	2020-08-18 00:46:37 +02:00
proguard-rules.pro	…