From ded221fba2cc21e1037a1130d9d142e657a52e89 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sun, 11 Jan 2015 17:54:36 +0100 Subject: Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into develop Conflicts: libjsqrc/ethereumjs/.travis.yml libjsqrc/ethereumjs/README.md libjsqrc/ethereumjs/dist/ethereum.js libjsqrc/ethereumjs/dist/ethereum.js.map libjsqrc/ethereumjs/lib/abi.js libjsqrc/ethereumjs/package.json --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index fafacbd5a..83b21d840 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,6 @@ before_script: script: - "jshint *.js lib" after_script: - - npm run-script gulp + - npm run-script build + - npm test + -- cgit v1.2.3