Merge branch 'master' into bootstrap4

af5a9fbf · JC Brand · 439e2a25 · d36a7b51 · af5a9fbf
Commit af5a9fbf authored Mar 06, 2018 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

.travis.yml .travis.yml +1 -1

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ addons:
    chrome: stable
 node_js:
 - 6
-install: make stamp-npm
+install: make node_modules
 before_script: make serve_bg
 script: make check
 sudo: false