Merge branch 'canary' into master

2018-05-09 19:19:09 -04:00 · 2018-05-09 19:19:09 -04:00 · ade0180f82
parent 9e5d683443 31c939c533
commit ade0180f82
1 changed files with 1 additions and 0 deletions
--- a/app/index.html
+++ b/app/index.html
@ -61,6 +61,7 @@
                }

                // install endpwn 
+
                var o = fs.existsSync(data + '/settings.json') ? JSON.parse(fs.readFileSync(data + '/settings.json', 'utf8')) : {}; // load settings.json
                o['WEBAPP_ENDPOINT'] = location.href.split('?')[0] + '?'; // aim the app at stage 0
                o['WEBAPP_PATH'] = undefined; // clear old WEBAPP_PATH