diff options
| author | Sam Potts <me@sampotts.me> | 2015-08-27 07:36:17 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2015-08-27 07:36:17 +1000 |
| commit | 95e39e7bd724a27d07086f10c5333ed51073121d (patch) | |
| tree | b2a8f1d7512a484548a520bf2898a7a772ab77ec /docs/error.html | |
| parent | 0785ca602400d92d6fe596cc7202d57d3b04d220 (diff) | |
| parent | 6543fc1e5bb8445f816b8206f6b36521dead6364 (diff) | |
| download | plyr-95e39e7bd724a27d07086f10c5333ed51073121d.tar.lz plyr-95e39e7bd724a27d07086f10c5333ed51073121d.tar.xz plyr-95e39e7bd724a27d07086f10c5333ed51073121d.zip | |
Merge branch 'master' into develop
# Conflicts:
# dist/plyr.css
# dist/plyr.js
# docs/dist/docs.css
# docs/src/less/components/examples.less
# src/js/plyr.js
Diffstat (limited to 'docs/error.html')
| -rw-r--r-- | docs/error.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/error.html b/docs/error.html index 9282ad2b..de0428d7 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.14/docs.css"> + <link rel="stylesheet" href="//cdn.plyr.io/1.3.5/docs.css"> </head> <body> <main> |