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
..
config-features.xml	[merge] Disable threads feedback	2022-04-12 11:57:37 +02:00
config-settings.xml	Merge tag 'v1.5.12' into sc	2022-12-15 11:01:52 +01:00
config.xml	Merge remote-tracking branch 'CicadaCinema/fallback-turn-server' into sc	2023-04-24 12:02:18 +02:00
urls.xml	moving ftue ems url to the urls config file	2022-04-08 13:17:56 +01:00