ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	changelog.md
#	dist/plyr.js
This commit is contained in:
Sam Potts
2015-07-20 22:25:31 +10:00
parent cdf3deb458 b5fc21239b
commit 8894b4c7b9
7 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/index.html
View File

@ -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>