diff options
| author | Sam Potts <sam@potts.es> | 2018-07-18 21:44:39 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-07-18 21:44:39 +1000 |
| commit | f8e4ba36e5a32e15632798b23f46c7f65d9e95d3 (patch) | |
| tree | eddca50a50ce4627208a4b4e18b3bbe847cad355 /demo/src | |
| parent | f3d538958768af3f0faa2c2b12297c5db6abb46e (diff) | |
| parent | 8616895e57db03a7613f91823e6c81358427df09 (diff) | |
| download | plyr-f8e4ba36e5a32e15632798b23f46c7f65d9e95d3.tar.lz plyr-f8e4ba36e5a32e15632798b23f46c7f65d9e95d3.tar.xz plyr-f8e4ba36e5a32e15632798b23f46c7f65d9e95d3.zip | |
Merge branch 'master' into develop
# Conflicts:
# changelog.md
# dist/plyr.js.map
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js.map
# package.json
Diffstat (limited to 'demo/src')
0 files changed, 0 insertions, 0 deletions