Skip to content

Commit

Permalink
Merge branch 'master' into auth
Browse files Browse the repository at this point in the history
  • Loading branch information
scottlamb committed Nov 20, 2018
2 parents 61af963 + 496f7d7 commit 679370c
Show file tree
Hide file tree
Showing 2 changed files with 1,216 additions and 637 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ matrix:
- ci/install-ffmpeg.sh
script:
- ci/script-rust.sh
- language: node_js
node_js: "node"
script:
- yarn
- yarn build
- node_modules/eslint/bin/eslint.js ui-src
- language: node_js
node_js: "8"
script:
Expand Down
Loading

0 comments on commit 679370c

Please sign in to comment.