diff options
| author | Sam Potts <me@sampotts.me> | 2016-04-25 19:10:10 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2016-04-25 19:10:10 +1000 |
| commit | 70297321c3ba96cc7cbf0fdcc25ada49de604d4e (patch) | |
| tree | c5bf09f0363462c10238a7126f2ec71bb74d474a /docs/src/less/lib | |
| parent | a02609c3e3176845f74396e259d14fe2a4db14ca (diff) | |
| parent | 5bb4d70cf76c0bd0dce906ae6416c5c039a11b85 (diff) | |
| download | plyr-70297321c3ba96cc7cbf0fdcc25ada49de604d4e.tar.lz plyr-70297321c3ba96cc7cbf0fdcc25ada49de604d4e.tar.xz plyr-70297321c3ba96cc7cbf0fdcc25ada49de604d4e.zip | |
Merge branch 'develop' of github.com:selz/plyr into develop
# Conflicts:
# .gitignore
# dist/plyr.css
# dist/plyr.js
# dist/sprite.svg
# docs/dist/docs.css
# docs/dist/docs.js
# docs/src/less/components/examples.less
# src/js/plyr.js
# src/less/plyr.less
# src/sprite/icon-fast-forward.svg
# src/sprite/icon-pause.svg
# src/sprite/icon-play.svg
# src/sprite/icon-rewind.svg
Diffstat (limited to 'docs/src/less/lib')
0 files changed, 0 insertions, 0 deletions