diff options
| author | Sam Potts <sam@potts.es> | 2018-06-13 00:41:30 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-06-13 00:41:30 +1000 |
| commit | aae1092bacd464a074ee26feab6f371903e83d90 (patch) | |
| tree | f64843714e6511c843a5597c4fed8ebea9474bfd /src/js/utils/is.js | |
| parent | 392dfd024c505f5ae1bbb2f0d3e0793c251a1f35 (diff) | |
| parent | 7158e507adb11e187380f3148750435f2bd611ae (diff) | |
| download | plyr-aae1092bacd464a074ee26feab6f371903e83d90.tar.lz plyr-aae1092bacd464a074ee26feab6f371903e83d90.tar.xz plyr-aae1092bacd464a074ee26feab6f371903e83d90.zip | |
Merge branch 'develop' of github.com:sampotts/plyr into develop
# Conflicts:
# src/js/captions.js
# src/js/controls.js
# src/js/fullscreen.js
# src/js/html5.js
# src/js/listeners.js
# src/js/plugins/youtube.js
# src/js/plyr.js
# src/js/utils.js
Diffstat (limited to 'src/js/utils/is.js')
0 files changed, 0 insertions, 0 deletions