diff options
| author | Sam Potts <me@sampotts.me> | 2018-01-14 22:55:44 +1100 | 
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2018-01-14 22:55:44 +1100 | 
| commit | cfc86bcb7cc4be3608a08132aaf4946a63594559 (patch) | |
| tree | 1880790c87ff9e26f846b61f35992096c2909b9e /demo/src | |
| parent | bbdf225d7b25c16d293108a9cf813c521f4d44eb (diff) | |
| parent | 5f96ec6ac2765c176645651881fa2d0ba666f58b (diff) | |
| download | plyr-cfc86bcb7cc4be3608a08132aaf4946a63594559.tar.lz plyr-cfc86bcb7cc4be3608a08132aaf4946a63594559.tar.xz plyr-cfc86bcb7cc4be3608a08132aaf4946a63594559.zip | |
Merge branch 'beta' into beta-with-ads
# Conflicts:
#	demo/dist/demo.js
#	demo/dist/demo.js.map
#	dist/plyr.js
#	dist/plyr.js.map
Diffstat (limited to 'demo/src')
| -rw-r--r-- | demo/src/js/demo.js | 13 | 
1 files changed, 0 insertions, 13 deletions
| diff --git a/demo/src/js/demo.js b/demo/src/js/demo.js index 7adfa2d7..8db7910c 100644 --- a/demo/src/js/demo.js +++ b/demo/src/js/demo.js @@ -48,19 +48,6 @@ document.addEventListener('DOMContentLoaded', () => {          captions: {              active: true,          }, -        controls: [ -            'play-large', -            'play', -            'progress', -            'current-time', -            'mute', -            'volume', -            'captions', -            'settings', -            'fullscreen', -            'pip', -            'airplay', -        ],          keys: {              google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c',          }, | 
