Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021

2021-05-06 08:05:14 +01:00 · 2021-05-06 08:05:14 +01:00 · 90538c95aa
commit 90538c95aa
parent a7642b2b24 68210b1415
153 changed files with 2506 additions and 981 deletions
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@ -474,7 +474,10 @@ export const SETTINGS: {[setting: string]: ISetting} = {
    },
    "webRtcAllowPeerToPeer": {
        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
-        displayName: _td('Allow Peer-to-Peer for 1:1 calls'),
+        displayName: _td(
+            "Allow Peer-to-Peer for 1:1 calls " +
+            "(if you enable this, the other party might be able to see your IP address)",
+        ),
        default: true,
        invertedSettingName: 'webRtcForceTURN',
    },