diff options
| author | Sam Potts <me@sampotts.me> | 2017-11-18 19:33:01 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2017-11-18 19:33:01 +1100 |
| commit | 5a244b7fedf185842b04f817eb07f49ae589d4a6 (patch) | |
| tree | 86bcff6d5b6f9843df0d4f1ad3da926569066662 /src/js/types.js | |
| parent | 4dca4bf93c5cfcb8adb40b78528867de271b8361 (diff) | |
| parent | 6984d6fb1606a71edd35ac043ac1116b6de8e98b (diff) | |
| download | plyr-5a244b7fedf185842b04f817eb07f49ae589d4a6.tar.lz plyr-5a244b7fedf185842b04f817eb07f49ae589d4a6.tar.xz plyr-5a244b7fedf185842b04f817eb07f49ae589d4a6.zip | |
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
# dist/plyr.js.map
# src/js/controls.js
Diffstat (limited to 'src/js/types.js')
0 files changed, 0 insertions, 0 deletions