Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Julian Lam
2016-12-22 09:21:32 -05:00
19 changed files with 289 additions and 77 deletions

View File

@@ -39,6 +39,11 @@ module.exports = function (Plugins) {
};
Plugins.prepareForBuild = function (callback) {
Plugins.cssFiles.length = 0;
Plugins.lessFiles.length = 0;
Plugins.clientScripts.length = 0;
Plugins.acpScripts.length = 0;
async.waterfall([
async.apply(Plugins.getPluginPaths),
function (paths, next) {