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
..
attachment-viewer	Merge tag 'v1.5.24' into sc	2023-02-08 13:08:42 +01:00
core-utils	Merge tag 'v1.5.26' into sc	2023-02-23 11:55:21 +01:00
external	Bump org.json:json from 20220924 to 20230227	2023-02-28 00:01:45 +00:00
multipicker	Merge tag 'v1.5.4' into merge-v1.5.4	2022-10-28 18:02:53 +02:00
ui-strings	Merge remote-tracking branch 'CicadaCinema/fallback-turn-server' into sc	2023-04-24 12:02:18 +02:00
ui-styles	[merge] More appropriate pill size for downstream text size	2023-04-11 17:27:21 +02:00