diff options
| author | Sam Potts <me@sampotts.me> | 2018-01-30 09:22:14 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2018-01-30 09:22:14 +1100 |
| commit | 71efbe7a927a9638204129ca7a2d52c498fa7e6e (patch) | |
| tree | f0ed45d84bc0304a543bafa08216355e63e55ac8 /src/js/utils.js | |
| parent | afd695cb391535b508dc7a4301b6c2692ce2b607 (diff) | |
| parent | 8f7a8940f36ab85c87a3406a378d383e58ee3d60 (diff) | |
| download | plyr-71efbe7a927a9638204129ca7a2d52c498fa7e6e.tar.lz plyr-71efbe7a927a9638204129ca7a2d52c498fa7e6e.tar.xz plyr-71efbe7a927a9638204129ca7a2d52c498fa7e6e.zip | |
Merge branch 'beta' into fix/ads-blocked
# Conflicts:
# dist/plyr.js
# dist/plyr.js.map
# src/js/plugins/ads.js
# src/js/plyr.js
Diffstat (limited to 'src/js/utils.js')
0 files changed, 0 insertions, 0 deletions