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
..
2023-04-24 12:02:18 +02:00
2022-02-23 18:08:04 +01:00
2022-10-17 09:14:28 +02:00