diff options
| author | Sam Potts <me@sampotts.me> | 2016-10-23 15:27:28 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2016-10-23 15:27:28 +1100 |
| commit | 5cecf16d4f9edecdbf656e2618b8748ebff677d8 (patch) | |
| tree | 1a06c99fbb1ea61b23a3e061e526c4154150eaae /demo/src | |
| parent | 21a30f1b6fd3f95550ea37fc610b94ea9e688899 (diff) | |
| parent | a3ed3093429d5306a89566215207d42a476392d8 (diff) | |
| download | plyr-5cecf16d4f9edecdbf656e2618b8748ebff677d8.tar.lz plyr-5cecf16d4f9edecdbf656e2618b8748ebff677d8.tar.xz plyr-5cecf16d4f9edecdbf656e2618b8748ebff677d8.zip | |
Merge branch 'master' into develop
# Conflicts:
# demo/dist/demo.js
# dist/plyr.css
# dist/plyr.js
Diffstat (limited to 'demo/src')
0 files changed, 0 insertions, 0 deletions