diff options
| author | Sam Potts <sam@potts.es> | 2020-01-21 22:15:38 +0000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2020-01-21 22:15:38 +0000 |
| commit | 89136bc2e6b3c8bf01c7642ae660d7e561263363 (patch) | |
| tree | 994cff40d6e2297363c12d8b4c8061a7266a7c8e /src/js/html5.js | |
| parent | 7883792ccc2b9e12834a521b79b02b4a45df4d96 (diff) | |
| parent | b6d94e000f1c38772443281be50aca4c917adb37 (diff) | |
| download | plyr-89136bc2e6b3c8bf01c7642ae660d7e561263363.tar.lz plyr-89136bc2e6b3c8bf01c7642ae660d7e561263363.tar.xz plyr-89136bc2e6b3c8bf01c7642ae660d7e561263363.zip | |
Merge branch 'develop' of github.com:sampotts/plyr into develop
# Conflicts:
# src/sass/components/video.scss
Diffstat (limited to 'src/js/html5.js')
0 files changed, 0 insertions, 0 deletions