diff options
| author | Sam Potts <sam@potts.es> | 2018-07-18 21:44:39 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-07-18 21:44:39 +1000 |
| commit | f8e4ba36e5a32e15632798b23f46c7f65d9e95d3 (patch) | |
| tree | eddca50a50ce4627208a4b4e18b3bbe847cad355 /src/js/plyr.js | |
| parent | f3d538958768af3f0faa2c2b12297c5db6abb46e (diff) | |
| parent | 8616895e57db03a7613f91823e6c81358427df09 (diff) | |
| download | plyr-f8e4ba36e5a32e15632798b23f46c7f65d9e95d3.tar.lz plyr-f8e4ba36e5a32e15632798b23f46c7f65d9e95d3.tar.xz plyr-f8e4ba36e5a32e15632798b23f46c7f65d9e95d3.zip | |
Merge branch 'master' into develop
# Conflicts:
# changelog.md
# dist/plyr.js.map
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js.map
# package.json
Diffstat (limited to 'src/js/plyr.js')
| -rw-r--r-- | src/js/plyr.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index 6ecc328a..d1f14881 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v3.3.16 +// plyr.js v3.3.21 // https://github.com/sampotts/plyr // License: The MIT License (MIT) // ========================================================================== |