merge branch master into config

2020-08-03 04:46:07 +09:00
parent 0a0e7112f0 f25728eca4
commit 6c375a52bc
35 changed files with 1467 additions and 1411 deletions
@@ -1,6 +1,7 @@
 define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdrop', 'browser', 'page', 'appSettings', 'apphost', 'connectionManager'], function (loading, globalize, events, viewManager, skinManager, backdrop, browser, page, appSettings, appHost, connectionManager) {
    'use strict';

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

    var appRouter = {