diff options
| author | Sam Potts <me@sampotts.me> | 2016-05-10 10:01:29 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2016-05-10 10:01:29 +1000 |
| commit | d351f9f172492707ac3148c39b2a242f9b9c8f53 (patch) | |
| tree | d9ba1348932f28a0b6fc631c9283b8be36b51de9 /docs/index.html | |
| parent | 3f20462943b44850473a9bbad820a550e79665d0 (diff) | |
| parent | 4d67d68c6b57dff5a16eb2ebb8dffac21d509185 (diff) | |
| download | plyr-d351f9f172492707ac3148c39b2a242f9b9c8f53.tar.lz plyr-d351f9f172492707ac3148c39b2a242f9b9c8f53.tar.xz plyr-d351f9f172492707ac3148c39b2a242f9b9c8f53.zip | |
Merge branch 'master' into develop
# Conflicts:
# dist/plyr.css
# src/less/plyr.less
Diffstat (limited to 'docs/index.html')
0 files changed, 0 insertions, 0 deletions