diff options
| author | Sam Potts <me@sampotts.me> | 2017-04-15 23:22:35 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2017-04-15 23:22:35 +1000 |
| commit | 546cdaad92097b3bc6a85850ac16eb782d91193d (patch) | |
| tree | 261aa4dc5765ecaae407677e060f8d0ed666855d /demo/src/js | |
| parent | 5d38497f0742626ad774b461be5ac164b34a6c16 (diff) | |
| parent | 808a3af3cf7df98d71ea79a960c09d06e0530805 (diff) | |
| download | plyr-546cdaad92097b3bc6a85850ac16eb782d91193d.tar.lz plyr-546cdaad92097b3bc6a85850ac16eb782d91193d.tar.xz plyr-546cdaad92097b3bc6a85850ac16eb782d91193d.zip | |
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
Diffstat (limited to 'demo/src/js')
0 files changed, 0 insertions, 0 deletions