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
..
assets	Try to communicate with WidgetPostAPI	2020-05-13 20:04:08 +02:00
java/org/matrix	Merge remote-tracking branch 'upstream/master' into sc_1.0.7	2020-09-17 12:03:17 +02:00
res	Format strings.xml	2020-09-16 19:35:27 +02:00
AndroidManifest.xml	Rename package of SDK modules	2020-08-13 12:50:58 +02:00