diff options
| author | Sam Potts <me@sampotts.me> | 2017-03-25 10:37:21 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2017-03-25 10:37:21 +1100 |
| commit | 4a2866d05f767d49e3679ef995166edfb8f423a2 (patch) | |
| tree | cd92b12a99b04638cbeade88cddea0efbe972ef4 /demo/src/js/main.js | |
| parent | 1a05f352c71e52b98ff4c0753c35bb51a6bf10f0 (diff) | |
| parent | ba27de066942b7654a0b7c58c43c9deba4161532 (diff) | |
| download | plyr-4a2866d05f767d49e3679ef995166edfb8f423a2.tar.lz plyr-4a2866d05f767d49e3679ef995166edfb8f423a2.tar.xz plyr-4a2866d05f767d49e3679ef995166edfb8f423a2.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