mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-29 06:28:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/vector
History
SpiritCroc 5b7e2fdcaa Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush-2 
Change-Id: If4c64b14513d70cd376e3e1a9fbaeb1efb0ded12

Conflicts:
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
2021-08-11 18:08:02 +02:00
..
sampledata textSize 15sp -> android:textAppearance="@style/VectorTextAppearanceSubtitle or Body 2021-06-14 22:10:12 +02:00
signature
src Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush-2 2021-08-11 18:08:02 +02:00
.gitignore
build.gradle Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush-2 2021-08-11 18:08:02 +02:00
lint.xml Remove useless parent 2021-06-11 10:22:18 +02:00
proguard-rules.pro