master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
4651bd9e4d
schildichat-android/vector
History
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
..
sampledata
signature
src Merge remote-tracking branch 'upstream/master' into sc_1.0.7 2020-09-17 12:03:17 +02:00
.gitignore Update .gitignore for gplay builds 2020-08-09 17:02:51 +02:00
build.gradle Merge remote-tracking branch 'upstream/master' into sc_1.0.7 2020-09-17 12:03:17 +02:00
lint.xml Set severity of ObsoleteSdkInt to error 2020-08-18 00:46:37 +02:00
proguard-rules.pro Initial commit jitsi 2020-08-14 09:31:24 +02:00