diff options
| author | Sam Potts <sam@potts.es> | 2020-11-14 13:35:22 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2020-11-14 13:35:22 +1100 |
| commit | 87078d7a4449ff8924bcbaf5e7efbed404d76393 (patch) | |
| tree | 8e9c0a25275e14f07102d189c6ea817844c07d01 /tasks/build.js | |
| parent | 36b53d2cf03ad8c9dc3926997c6e0949651546c3 (diff) | |
| parent | c300df57427d56648befb6af2604145d0b53e8d2 (diff) | |
| download | plyr-87078d7a4449ff8924bcbaf5e7efbed404d76393.tar.lz plyr-87078d7a4449ff8924bcbaf5e7efbed404d76393.tar.xz plyr-87078d7a4449ff8924bcbaf5e7efbed404d76393.zip | |
Merge branch 'master' into develop
# Conflicts:
# demo/dist/demo.min.js
# demo/dist/demo.min.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.min.mjs
# dist/plyr.min.mjs.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# dist/plyr.polyfilled.min.mjs
# dist/plyr.polyfilled.min.mjs.map
# yarn.lock
Diffstat (limited to 'tasks/build.js')
0 files changed, 0 insertions, 0 deletions