Skip to content

Commit

Permalink
Merge b16d3d0 into 62a2917
Browse files Browse the repository at this point in the history
  • Loading branch information
erynnb committed Apr 27, 2018
2 parents 62a2917 + b16d3d0 commit 67bc5a9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
Expand Up @@ -36,13 +36,11 @@ before_install:
- export CHROME_BIN=/usr/bin/google-chrome
- export DISPLAY=:99.0
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./test/helpers/travis_pr_setup.sh; fi'
- npm i -g npm@5.7.1
- npm install -g bower

install:
- npm install

before_script:
- npm install -g bower
- npm install -g grunt-cli
- bower install

after_success: npm run coveralls
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -49,7 +49,7 @@
"object-path": "^0.11.4",
"parse-authors": "^0.2.4",
"passport": "^0.4.0",
"passport-steam": "^1.0.8",
"passport-steam": "^1.0.10",
"passport-twitch": "^1.0.3",
"pug": "^2.0.0-rc.4",
"raven": "^2.2.1",
Expand Down

0 comments on commit 67bc5a9

Please sign in to comment.