diff options
| author | Sam Potts <me@sampotts.me> | 2017-02-05 11:36:53 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2017-02-05 11:36:53 +1100 |
| commit | 9c599884a85d922ad6ceb20f6a6c2cffc132e845 (patch) | |
| tree | 29683f8b3fd8abdc76250499d1ca50dd9c55782b /demo/src/js/main.js | |
| parent | cbef45841cbd677a62052e8464151704c55f9966 (diff) | |
| parent | 96d9f302c236ceccd98d7ffa07d57cc38313ce32 (diff) | |
| download | plyr-9c599884a85d922ad6ceb20f6a6c2cffc132e845.tar.lz plyr-9c599884a85d922ad6ceb20f6a6c2cffc132e845.tar.xz plyr-9c599884a85d922ad6ceb20f6a6c2cffc132e845.zip | |
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
# src/js/plyr.js
Diffstat (limited to 'demo/src/js/main.js')
0 files changed, 0 insertions, 0 deletions