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

# Conflicts: # src/js/plyr.js
2016-02-21 14:04:13 +11:00
parent b18ed03384 6a0b3dc823
commit cad142fe85
9 changed files with 110 additions and 95 deletions
--- a/docs/src/js/docs.js
+++ b/docs/src/js/docs.js
@ -13,8 +13,7 @@ plyr.setup('.js-media-player', {
 	},
 	captions: {
 		defaultActive: 	true
-	},
-	duration: 100
+	}
 });

 // Setup shr