diff options
| author | Sam Potts <sam@potts.es> | 2017-11-07 23:23:17 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2017-11-07 23:23:17 +1100 |
| commit | 1a5f4b1b9e1b2b8b316997c4be33d9af240e1383 (patch) | |
| tree | 4bc660a5f04ea0908c01d32ee4730fe19fc10c83 /src/js/plugins/vimeo.js | |
| parent | 3f41a0cf5417a3047aafa27894b57fb740d7d7da (diff) | |
| parent | 966ca1acc30d87e1b821d78cfddc35ca75557eff (diff) | |
| download | plyr-1a5f4b1b9e1b2b8b316997c4be33d9af240e1383.tar.lz plyr-1a5f4b1b9e1b2b8b316997c4be33d9af240e1383.tar.xz plyr-1a5f4b1b9e1b2b8b316997c4be33d9af240e1383.zip | |
Merge branch 'develop' of github.com:Selz/plyr into develop
# Conflicts:
# dist/plyr.js
# dist/plyr.js.map
# src/js/defaults.js
Diffstat (limited to 'src/js/plugins/vimeo.js')
0 files changed, 0 insertions, 0 deletions