diff options
| author | Sam Potts <sam@potts.es> | 2018-05-31 23:43:40 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-05-31 23:43:40 +1000 |
| commit | a4caba120c76a19fa9424598de119c44776e386d (patch) | |
| tree | 3d20818f19da4298838dd295105abc63088d2b48 /demo/src | |
| parent | 969a877a34e0cad1bca4bf17e9661ba6e73bcb99 (diff) | |
| parent | fb22a90d33ad991e1f6de22f201c3b49f54168c1 (diff) | |
| download | plyr-a4caba120c76a19fa9424598de119c44776e386d.tar.lz plyr-a4caba120c76a19fa9424598de119c44776e386d.tar.xz plyr-a4caba120c76a19fa9424598de119c44776e386d.zip | |
Merge branch 'master' of github.com:sampotts/plyr
# Conflicts:
# demo/dist/demo.css
# dist/plyr.css
# dist/plyr.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
Diffstat (limited to 'demo/src')
0 files changed, 0 insertions, 0 deletions