Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-10 07:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julian Lam
2018-04-11 16:30:03 -04:00
parent 2e6e7f7484 90a99fe158
commit 7ba2ac9f69
81 changed files with 494 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/install.js
View File

@@ -157,6 +157,11 @@ function completeConfigSetup(config, next) {
}
}
// Add package_manager object if set
if (nconf.get('package_manager')) {
config.package_manager = nconf.get('package_manager');
}
nconf.overrides(config);
async.waterfall([
function (next) {