diff options
| author | Sam <me@sampotts.me> | 2016-05-11 22:47:27 +1000 |
|---|---|---|
| committer | Sam <me@sampotts.me> | 2016-05-11 22:47:27 +1000 |
| commit | 4a69ef38746383ab5f47115e2651b70d04f7c0bb (patch) | |
| tree | 4a5ca9ae4b68dc96beee7a257dbbbaa4ca330231 /src/js | |
| parent | d351f9f172492707ac3148c39b2a242f9b9c8f53 (diff) | |
| parent | 31c933af3838669a6bb043cafe7778a810303f47 (diff) | |
| download | plyr-4a69ef38746383ab5f47115e2651b70d04f7c0bb.tar.lz plyr-4a69ef38746383ab5f47115e2651b70d04f7c0bb.tar.xz plyr-4a69ef38746383ab5f47115e2651b70d04f7c0bb.zip | |
Merge branch 'master' into develop
# Conflicts:
# dist/plyr.css
# src/less/plyr.less
Diffstat (limited to 'src/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 b1c3e764..5d914fc3 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v1.6.4 +// plyr.js v1.6.5 // https://github.com/selz/plyr // License: The MIT License (MIT) // ========================================================================== |