diff options
| author | Sam Potts <me@sampotts.me> | 2017-05-07 19:04:05 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2017-05-07 19:04:05 +1000 |
| commit | 9e2580ec6af03bd994f4a8d7f966be02cf92da8a (patch) | |
| tree | 1cf53fc2a50a9421ab9f0c3d6e1370b1d3cc2ce1 /demo/src | |
| parent | aba5a9dc0e421a9f8a6098847fe3927f565c3241 (diff) | |
| parent | 9999828505973657377dea5e3957222af7d66e38 (diff) | |
| download | plyr-9e2580ec6af03bd994f4a8d7f966be02cf92da8a.tar.lz plyr-9e2580ec6af03bd994f4a8d7f966be02cf92da8a.tar.xz plyr-9e2580ec6af03bd994f4a8d7f966be02cf92da8a.zip | |
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
Diffstat (limited to 'demo/src')
0 files changed, 0 insertions, 0 deletions