diff options
| author | Sam Potts <me@sampotts.me> | 2016-11-06 15:55:55 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2016-11-06 15:55:55 +1100 |
| commit | bae04a492ae849c47a7fbcc05d7bc2265c9e0688 (patch) | |
| tree | a3d754ab1cfa4ee5ff91bbf10fd915a776fe9432 /demo/src/js/main.js | |
| parent | 72404e77e5b771a0724443569620d01eb15cc9ba (diff) | |
| parent | 73a1391f2fbe3e986fc09ec82b433674128b1160 (diff) | |
| download | plyr-bae04a492ae849c47a7fbcc05d7bc2265c9e0688.tar.lz plyr-bae04a492ae849c47a7fbcc05d7bc2265c9e0688.tar.xz plyr-bae04a492ae849c47a7fbcc05d7bc2265c9e0688.zip | |
Merge branch 'master' into develop
# Conflicts:
# demo/index.html
# dist/plyr.js
Diffstat (limited to 'demo/src/js/main.js')
0 files changed, 0 insertions, 0 deletions