diff options
| author | Sam Potts <me@sampotts.me> | 2016-02-21 14:04:13 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2016-02-21 14:04:13 +1100 |
| commit | cad142fe859dbc1fd1db42cb19b1902f25cf6384 (patch) | |
| tree | e7f8b469d7d2924d2155285e72bc1e8171be8d73 /docs/src/js | |
| parent | b18ed0338477059b0c8bace92fc96cf5ef0bbc6f (diff) | |
| parent | 6a0b3dc823f48294b967f9123294d3e2068e3a8f (diff) | |
| download | plyr-cad142fe859dbc1fd1db42cb19b1902f25cf6384.tar.lz plyr-cad142fe859dbc1fd1db42cb19b1902f25cf6384.tar.xz plyr-cad142fe859dbc1fd1db42cb19b1902f25cf6384.zip | |
Merge branch 'master' of github.com:selz/plyr
# Conflicts:
# src/js/plyr.js
Diffstat (limited to 'docs/src/js')
| -rw-r--r-- | docs/src/js/docs.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/src/js/docs.js b/docs/src/js/docs.js index bedb91cb..f0f688b7 100644 --- 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 |