Merge remote-tracking branch 'upstream/master'

2016-04-05 17:35:45 +02:00 · 2016-04-05 17:35:45 +02:00 · a37f8b712a
parent 72009a8fed b60e074710
commit a37f8b712a
1 changed files with 1 additions and 1 deletions
--- a/config.js
+++ b/config.js
@ -54,7 +54,7 @@ var config = {
    disableAudioLevels: false,
    channelLastN: -1, // The default value of the channel attribute last-n.
    adaptiveLastN: false,
-    adaptiveSimulcast: false,
+    //disableAdaptiveSimulcast: false,
    enableRecording: false,
    enableWelcomePage: true,
    disableSimulcast: false,