diff options
author | Gav Wood <i@gavwood.com> | 2015-01-12 00:54:36 +0800 |
---|---|---|
committer | Gav Wood <i@gavwood.com> | 2015-01-12 00:54:36 +0800 |
commit | ded221fba2cc21e1037a1130d9d142e657a52e89 (patch) | |
tree | 48d0c2871eafec7049d0f5c04b24db8d0f91df3f /.travis.yml | |
parent | 47687cf085196e2e4fa7ec42ff426f241dae10c5 (diff) | |
download | go-tangerine-ded221fba2cc21e1037a1130d9d142e657a52e89.tar go-tangerine-ded221fba2cc21e1037a1130d9d142e657a52e89.tar.gz go-tangerine-ded221fba2cc21e1037a1130d9d142e657a52e89.tar.bz2 go-tangerine-ded221fba2cc21e1037a1130d9d142e657a52e89.tar.lz go-tangerine-ded221fba2cc21e1037a1130d9d142e657a52e89.tar.xz go-tangerine-ded221fba2cc21e1037a1130d9d142e657a52e89.tar.zst go-tangerine-ded221fba2cc21e1037a1130d9d142e657a52e89.zip |
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
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 4 |
1 files changed, 3 insertions, 1 deletions
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 + |