diff options
| author | Sam Potts <sam@potts.es> | 2020-11-14 13:11:24 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2020-11-14 13:11:24 +1100 |
| commit | 31861bd475b3663ddcaa277dccabcdbc95fd8bf1 (patch) | |
| tree | baed54fb71fbb81d2b817d57bad54736e1ecf3ab /src/js/plyr.js | |
| parent | cd3962ca3296e3478dca84bd6a4557ed0a158f1a (diff) | |
| parent | c3e163741fd5a4a88e56c9d425109f2014c8511f (diff) | |
| download | plyr-31861bd475b3663ddcaa277dccabcdbc95fd8bf1.tar.lz plyr-31861bd475b3663ddcaa277dccabcdbc95fd8bf1.tar.xz plyr-31861bd475b3663ddcaa277dccabcdbc95fd8bf1.zip | |
Merge branch 'master' into develop
# Conflicts:
# package.json
# src/js/plugins/vimeo.js
# src/js/plugins/youtube.js
# src/js/ui.js
# yarn.lock
Diffstat (limited to 'src/js/plyr.js')
0 files changed, 0 insertions, 0 deletions