Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/master' into JENKINS-37323

  • Loading branch information...
scherler committed Sep 8, 2016
2 parents 5afc5f5 + 3a3f8d8 commit d3547caa37af515fcb1174bbd22265106aebc828
@@ -16,4 +16,5 @@ work
bin/

node/
node_modules/
node_modules/
npm-debug.log
@@ -22,8 +22,8 @@
<properties>
<!-- https://github.com/jenkinsci/acceptance-test-harness -->
<jenkins.acceptance.testharness.version>1.30</jenkins.acceptance.testharness.version>
<node.version>5.8.0</node.version>
<npm.version>3.7.3</npm.version>
<node.version>6.4.0</node.version>
<npm.version>3.10.3</npm.version>
</properties>

<repositories>

0 comments on commit d3547ca

Please sign in to comment.
You can’t perform that action at this time.