Merge branch 'master' of github.com:selz/plyr
# Conflicts: # src/js/plyr.js
This commit is contained in:
@ -13,8 +13,7 @@ plyr.setup('.js-media-player', {
|
||||
},
|
||||
captions: {
|
||||
defaultActive: true
|
||||
},
|
||||
duration: 100
|
||||
}
|
||||
});
|
||||
|
||||
// Setup shr
|
||||
|
Reference in New Issue
Block a user