diff options
| author | Sam Potts <me@sampotts.me> | 2015-07-20 22:25:31 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2015-07-20 22:25:31 +1000 |
| commit | 8894b4c7b95e74a9fd04b2a8916e4968139df96f (patch) | |
| tree | ee51760ec9540a8b7e734ced20430d1c83663041 /docs | |
| parent | cdf3deb458716ae447a43943805291550fee91c3 (diff) | |
| parent | b5fc21239bb0068672c382a00cc839fc21fc62fb (diff) | |
| download | plyr-8894b4c7b95e74a9fd04b2a8916e4968139df96f.tar.lz plyr-8894b4c7b95e74a9fd04b2a8916e4968139df96f.tar.xz plyr-8894b4c7b95e74a9fd04b2a8916e4968139df96f.zip | |
Merge branch 'master' into develop
# Conflicts:
# changelog.md
# dist/plyr.js
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/error.html | 2 | ||||
| -rw-r--r-- | docs/index.html | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/error.html b/docs/error.html index 1463fe9c..9282ad2b 100644 --- a/docs/error.html +++ b/docs/error.html @@ -6,7 +6,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <!-- Docs styles --> - <link rel="stylesheet" href="//cdn.plyr.io/1.1.13/docs.css"> + <link rel="stylesheet" href="//cdn.plyr.io/1.1.14/docs.css"> </head> <body> <main> diff --git a/docs/index.html b/docs/index.html index 8535a778..77502f35 100644 --- a/docs/index.html +++ b/docs/index.html @@ -8,10 +8,10 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <!-- Styles --> - <link rel="stylesheet" href="https://cdn.plyr.io/1.1.13/plyr.css?1"> + <link rel="stylesheet" href="https://cdn.plyr.io/1.1.14/plyr.css?1"> <!-- Docs styles --> - <link rel="stylesheet" href="https://cdn.plyr.io/1.1.13/docs.css?2"> + <link rel="stylesheet" href="https://cdn.plyr.io/1.1.14/docs.css?2"> </head> <body> <header> @@ -95,13 +95,13 @@ b.insertBefore(c, b.childNodes[0]); } } - })(document, "https://cdn.plyr.io/1.1.13/sprite.svg"); + })(document, "https://cdn.plyr.io/1.1.14/sprite.svg"); </script> <!-- Plyr core script --> - <script src="https://cdn.plyr.io/1.1.13/plyr.js?1"></script> + <script src="https://cdn.plyr.io/1.1.14/plyr.js?1"></script> <!-- Docs script --> - <script src="https://cdn.plyr.io/1.1.13/docs.js?1"></script> + <script src="https://cdn.plyr.io/1.1.14/docs.js?1"></script> </body> </html> |