mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-24 02:15:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/vector
History
SpiritCroc 0cc0a191bc Merge remote-tracking branch 'CicadaCinema/fallback-turn-server' into sc 
Change-Id: I07acecb8587ee3bdf6b2eef1e130ffd578739416

Conflicts:
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/xml/vector_settings_voice_video.xml
2023-04-24 12:02:18 +02:00
..
sampledata Add required resources. 2022-05-27 15:25:59 +03:00
src Merge remote-tracking branch 'CicadaCinema/fallback-turn-server' into sc 2023-04-24 12:02:18 +02:00
.gitignore
build.gradle Merge tag 'v1.5.32' into sc 2023-04-20 10:53:09 +02:00