filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-15 03:06:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
2e9195df2b
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
build.gradle Merge remote-tracking branch 'upstream/master' into sc_1.0.7 2020-09-17 12:03:17 +02:00
lint.xml
proguard-rules.pro