1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
David Baker
2017-11-17 17:48:42 +00:00
5 changed files with 18 additions and 7 deletions

View File

@@ -92,7 +92,12 @@ const ANALYTICS_SETTINGS = [
// These settings must be defined in SettingsStore
const WEBRTC_SETTINGS = [
{ id: 'webRtcForceTURN' },
{
id: 'webRtcForceTURN',
fn: (val) => {
MatrixClientPeg.get().setForceTURN(val);
},
},
];
// These settings must be defined in SettingsStore