diff options
| author | Sam Potts <me@sampotts.me> | 2017-03-25 10:09:14 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2017-03-25 10:09:14 +1100 |
| commit | 7b6257ff2044efafa1dc7210537f2119700105ce (patch) | |
| tree | 290379ec8392a738203eb66530b8ffc936a7b0cd /demo/src/js/main.js | |
| parent | 13973125fbc18768400c55b7eece1ac4649b5386 (diff) | |
| parent | ddf910434944c671e92c0e934ce568a20cda19cb (diff) | |
| download | plyr-7b6257ff2044efafa1dc7210537f2119700105ce.tar.lz plyr-7b6257ff2044efafa1dc7210537f2119700105ce.tar.xz plyr-7b6257ff2044efafa1dc7210537f2119700105ce.zip | |
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
Diffstat (limited to 'demo/src/js/main.js')
0 files changed, 0 insertions, 0 deletions