Merge branch 'master' into dev

028a7ef6 · Cédric Moreau · 318ac745 · 95367d0f · 028a7ef6
Commit 028a7ef6 authored 8 years ago by Cédric Moreau
--- a/install.sh
+++ b/install.sh
@@ -95,7 +95,7 @@ install_from_git() {
  # Install Duniter dependencies (NPM modules)
  NODE=$DUNITER_DIR/node/bin/node
  NPM=$DUNITER_DIR/node/bin/npm
-  $NPM install
+  $NODE $NPM install
  return
 }