diff options
author | Sam Potts <sam@potts.es> | 2019-01-26 16:50:37 +1100 |
---|---|---|
committer | Sam Potts <sam@potts.es> | 2019-01-26 16:50:37 +1100 |
commit | 44739a17d0b2f4fbafa348370f7f32d179977045 (patch) | |
tree | bd5b38494bdd3ea760ea54056340efb5c0714edf /src | |
parent | 464acd1a3636b26dba1368e4c80b603845adbc76 (diff) | |
parent | ad72ebd4bbf487e56884d264a4bb13119fb687b5 (diff) | |
download | plyr-44739a17d0b2f4fbafa348370f7f32d179977045.tar.lz plyr-44739a17d0b2f4fbafa348370f7f32d179977045.tar.xz plyr-44739a17d0b2f4fbafa348370f7f32d179977045.zip |
Merge branch 'master' into develop
# Conflicts:
# changelog.md
# demo/dist/demo.js.map
# demo/dist/demo.min.js
# demo/dist/demo.min.js.map
# demo/index.html
# dist/plyr.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# package.json
# readme.md
# yarn.lock
Diffstat (limited to 'src')
-rw-r--r-- | src/js/config/defaults.js | 2 | ||||
-rw-r--r-- | src/js/plyr.js | 2 | ||||
-rw-r--r-- | src/js/plyr.polyfilled.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/js/config/defaults.js b/src/js/config/defaults.js index 1bb940f8..b12cd8d2 100644 --- a/src/js/config/defaults.js +++ b/src/js/config/defaults.js @@ -60,7 +60,7 @@ const defaults = { // Sprite (for icons) loadSprite: true, iconPrefix: 'plyr', - iconUrl: 'https://cdn.plyr.io/3.4.7/plyr.svg', + iconUrl: 'https://cdn.plyr.io/3.4.8/plyr.svg', // Blank video (used to prevent errors on source change) blankVideo: 'https://cdn.plyr.io/static/blank.mp4', diff --git a/src/js/plyr.js b/src/js/plyr.js index 1059ce05..674ffb3c 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v3.4.7 +// plyr.js v3.4.8 // https://github.com/sampotts/plyr // License: The MIT License (MIT) // ========================================================================== diff --git a/src/js/plyr.polyfilled.js b/src/js/plyr.polyfilled.js index ac6d1c28..42207a1e 100644 --- a/src/js/plyr.polyfilled.js +++ b/src/js/plyr.polyfilled.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr Polyfilled Build -// plyr.js v3.4.7 +// plyr.js v3.4.8 // https://github.com/sampotts/plyr // License: The MIT License (MIT) // ========================================================================== |