mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-22 14:14:18 +03:00
Code Issues Projects Releases Packages Wiki Activity
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 Room profile: make link in room topic clickable 2020-01-16 16:36:56 +01:00
signature Share the debug signature to all machines which build the debug APK 2019-06-07 10:17:14 +02:00
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