diff options
| author | Sam Potts <me@sampotts.me> | 2015-08-27 07:36:17 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2015-08-27 07:36:17 +1000 |
| commit | 95e39e7bd724a27d07086f10c5333ed51073121d (patch) | |
| tree | b2a8f1d7512a484548a520bf2898a7a772ab77ec /docs/dist/docs.css | |
| parent | 0785ca602400d92d6fe596cc7202d57d3b04d220 (diff) | |
| parent | 6543fc1e5bb8445f816b8206f6b36521dead6364 (diff) | |
| download | plyr-95e39e7bd724a27d07086f10c5333ed51073121d.tar.lz plyr-95e39e7bd724a27d07086f10c5333ed51073121d.tar.xz plyr-95e39e7bd724a27d07086f10c5333ed51073121d.zip | |
Merge branch 'master' into develop
# Conflicts:
# dist/plyr.css
# dist/plyr.js
# docs/dist/docs.css
# docs/src/less/components/examples.less
# src/js/plyr.js
Diffstat (limited to 'docs/dist/docs.css')
0 files changed, 0 insertions, 0 deletions