Merge branch 'master' into develop

This commit is contained in:
Julian Lam
2017-01-20 12:33:17 -05:00
18 changed files with 290 additions and 140 deletions

View File

@@ -29,8 +29,6 @@ var middleware;
Plugins.lessFiles = [];
Plugins.clientScripts = [];
Plugins.acpScripts = [];
Plugins.customLanguages = {};
Plugins.customLanguageFallbacks = {};
Plugins.libraryPaths = [];
Plugins.versionWarning = [];
Plugins.languageCodes = [];