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

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	demo/dist/demo.js
#	dist/plyr.css
#	dist/plyr.js
This commit is contained in:
Sam Potts
2016-10-23 15:27:28 +11:00
parent 21a30f1b6f a3ed309342
commit 5cecf16d4f
14 changed files with 104 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "plyr",
"version": "2.0.7",
"version": "2.0.9",
"description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
"homepage": "http://plyr.io",
"main": "src/js/plyr.js",