diff options
| author | Sam Potts <sam@potts.es> | 2020-01-14 07:46:48 +0000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2020-01-14 07:46:48 +0000 |
| commit | 7ee041403fd3992152ebdd3db82e2c3e4d3d34f5 (patch) | |
| tree | 65440fc7b540852be2651d7d27192eddbc4c721e /src | |
| parent | 53a400027f9356854cb8be8493cb6111d9cb3ce3 (diff) | |
| parent | 28a1098c0faaa9258bde62ebafadadece5605ea9 (diff) | |
| download | plyr-7ee041403fd3992152ebdd3db82e2c3e4d3d34f5.tar.lz plyr-7ee041403fd3992152ebdd3db82e2c3e4d3d34f5.tar.xz plyr-7ee041403fd3992152ebdd3db82e2c3e4d3d34f5.zip | |
Merge branch 'develop' of github.com:sampotts/plyr into develop
# Conflicts:
# src/js/controls.js
# src/sass/components/volume.scss
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions