diff options
| author | Sam Potts <me@sampotts.me> | 2015-07-31 21:34:07 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2015-07-31 21:34:07 +1000 |
| commit | 1ba1bec06611f45fdadc38cbc05507ef6c947ee8 (patch) | |
| tree | 2ea378a6e9e2b8006ff22d56ed4e0cd26bb9ac02 /src/js/plyr.js | |
| parent | aad4a720dcb0755371c2c8062ae9e8286ba9f467 (diff) | |
| parent | a9783481235d349d696025fff9edbf4622d8e467 (diff) | |
| download | plyr-1ba1bec06611f45fdadc38cbc05507ef6c947ee8.tar.lz plyr-1ba1bec06611f45fdadc38cbc05507ef6c947ee8.tar.xz plyr-1ba1bec06611f45fdadc38cbc05507ef6c947ee8.zip | |
Merge branch 'master' of github.com:selz/plyr
# Conflicts:
# src/sass/plyr.scss
Diffstat (limited to 'src/js/plyr.js')
| -rw-r--r-- | src/js/plyr.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index 90042b09..593a64b4 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v1.2.5 +// plyr.js v1.2.6 // https://github.com/selz/plyr // License: The MIT License (MIT) // ========================================================================== |