diff options
| author | Sam Potts <me@sampotts.me> | 2016-09-14 15:22:41 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2016-09-14 15:22:41 +1000 |
| commit | f608317eec8e008b45592dfb0b161a63603e3b3d (patch) | |
| tree | 6e2a61caaa5c96e78d97521ffd352f23985bdb33 /demo/src | |
| parent | c8b9c9bcaaf7fcf8c6386047cd8729b05159585f (diff) | |
| parent | d638cdcdd346b964ef0e782e4111adbe7877f05e (diff) | |
| download | plyr-f608317eec8e008b45592dfb0b161a63603e3b3d.tar.lz plyr-f608317eec8e008b45592dfb0b161a63603e3b3d.tar.xz plyr-f608317eec8e008b45592dfb0b161a63603e3b3d.zip | |
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.css
# dist/plyr.js
Diffstat (limited to 'demo/src')
0 files changed, 0 insertions, 0 deletions