merge branch master into config

2020-04-02 01:46:44 +09:00 · 2020-04-02 01:46:44 +09:00 · 850df11f27
commit 850df11f27
parent 53db7fe215 c202339b9a
351 changed files with 12788 additions and 5249 deletions
--- a/src/scripts/settings/userSettingsBuilder.js
+++ b/src/scripts/settings/userSettingsBuilder.js
@ -251,5 +251,5 @@ define(['appSettings', 'events'], function (appSettings, events) {
        return this.get(key, true);
    };

-    return new UserSettings();
+    return UserSettings;
 });