Merge branch 'master' into auth

2024-12-25 22:55:55 -05:00 · 2018-11-20 11:26:26 -08:00 · 2018-11-20 11:26:26 -08:00 · 679370c77a
commit 679370c77a
parent 61af963a64 496f7d7e3a
2 changed files with 1218 additions and 639 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -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:
--- a/yarn.lock
+++ b/yarn.lock