Merge branch 'master' of github.com:selz/plyr

# Conflicts:
#	src/js/plyr.js
This commit is contained in:
Sam Potts
2016-02-21 14:04:13 +11:00
9 changed files with 110 additions and 95 deletions

View File

@ -13,8 +13,7 @@ plyr.setup('.js-media-player', {
},
captions: {
defaultActive: true
},
duration: 100
}
});
// Setup shr