diff options
| author | Sam Potts <sam@potts.es> | 2018-07-24 09:38:26 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-07-24 09:38:26 +1000 |
| commit | 53a3d061038bd39628d3a47ca787311b2b36c496 (patch) | |
| tree | 7cc09edf868cf71099686c6092647e0560a6e774 /.gitignore | |
| parent | e63ad7c74bd763043344fd2bd568a64e7ea18622 (diff) | |
| parent | 544ab0086b06a1625c474b35c1f100d4a582a98a (diff) | |
| download | plyr-53a3d061038bd39628d3a47ca787311b2b36c496.tar.lz plyr-53a3d061038bd39628d3a47ca787311b2b36c496.tar.xz plyr-53a3d061038bd39628d3a47ca787311b2b36c496.zip | |
Merge branch 'develop' into a11y-improvements
# Conflicts:
# demo/dist/demo.css
# demo/dist/demo.js.map
# demo/dist/demo.min.js
# demo/dist/demo.min.js.map
# 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
# package.json
# yarn.lock
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ node_modules .DS_Store -aws.json +credentials.json *.mp4 !dist/blank.mp4 index-*.html |