Merge branch 'master' into migrate-to-ES6-48

2020-08-02 15:16:13 +01:00
parent 9067047403 406ee21847
commit ce2b2d70ab
12 changed files with 20 additions and 0 deletions
@@ -2,6 +2,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
    'use strict';

    playbackManager = playbackManager.default || playbackManager;
+    browser = browser.default || browser;
    loading = loading.default || loading;

    function showViewSettings(instance) {