diff options
| author | Sam Potts <sam@potts.es> | 2018-06-11 16:48:54 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-06-11 16:48:54 +1000 |
| commit | 38f954ef179d559095eeca5cbd5fd08fae211d34 (patch) | |
| tree | aa03737d9ec3739bbf914b7a1704590e25552833 /src | |
| parent | abd11823034fa2f661692d471b9aefcf2a164723 (diff) | |
| parent | efe70ab48efe5eb183c92673a0b321c3004b7f58 (diff) | |
| download | plyr-38f954ef179d559095eeca5cbd5fd08fae211d34.tar.lz plyr-38f954ef179d559095eeca5cbd5fd08fae211d34.tar.xz plyr-38f954ef179d559095eeca5cbd5fd08fae211d34.zip | |
Merge branch 'master' into develop
# Conflicts:
# 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/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/defaults.js b/src/js/defaults.js index b1bdaa65..ff207017 100644 --- a/src/js/defaults.js +++ b/src/js/defaults.js @@ -56,7 +56,7 @@ const defaults = { // Sprite (for icons) loadSprite: true, iconPrefix: 'plyr', - iconUrl: 'https://cdn.plyr.io/3.3.10/plyr.svg', + iconUrl: 'https://cdn.plyr.io/3.3.11/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 181eff9e..752b3d3c 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v3.3.10 +// plyr.js v3.3.11 // 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 f66a82de..852630ac 100644 --- a/src/js/plyr.polyfilled.js +++ b/src/js/plyr.polyfilled.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr Polyfilled Build -// plyr.js v3.3.10 +// plyr.js v3.3.11 // https://github.com/sampotts/plyr // License: The MIT License (MIT) // ========================================================================== |