Merge remote-tracking branch 'origin/develop'

This commit is contained in:
Julian Lam
2017-11-02 14:13:48 -04:00
58 changed files with 686 additions and 168 deletions

View File

@@ -72,7 +72,6 @@ JS.scripts = {
'public/src/modules/alerts.js',
'public/src/modules/taskbar.js',
'public/src/modules/helpers.js',
'public/src/modules/string.js',
'public/src/modules/flags.js',
'public/src/modules/storage.js',
],