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

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	dist/plyr.css
#	src/less/plyr.less
This commit is contained in:
Sam
2016-05-11 22:47:27 +10:00
parent d351f9f172 31c933af38
commit 4a69ef3874
9 changed files with 78 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/plyr.js
View File

@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
// plyr.js v1.6.4
// plyr.js v1.6.5
// https://github.com/selz/plyr
// License: The MIT License (MIT)
// ==========================================================================