Merge branch 'master' of github.com:sampotts/plyr

# Conflicts: # demo/dist/demo.css # dist/plyr.css # dist/plyr.js.map # dist/plyr.min.js # dist/plyr.min.js.map # dist/plyr.polyfilled.js.map # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map
2018-05-31 23:43:40 +10:00
parent 969a877a34 fb22a90d33
commit a4caba120c
26 changed files with 599 additions and 1889 deletions
--- a/package.json
+++ b/package.json
@ -65,6 +65,8 @@
        "doc": "readme.md"
    },
    "scripts": {
+        "build": "gulp build",
+        "lint": "eslint src/js",
        "test": "echo \"Error: no test specified\" && exit 1"
    },
    "author": "Sam Potts <sam@potts.es>",