Sam Potts 71efbe7a92 Merge branch 'beta' into fix/ads-blocked ...

# Conflicts:
#	dist/plyr.js
#	dist/plyr.js.map
#	src/js/plugins/ads.js
#	src/js/plyr.js

2018-01-30 09:22:14 +11:00

..

ads.js

Merge branch 'beta' into fix/ads-blocked

2018-01-30 09:22:14 +11:00

vimeo.js

Progressively enhance <iframe> embeds

2018-01-12 19:35:46 +11:00

youtube.js

Attempt to fix YouTube message error, added ads references, changes to bool

2018-01-25 22:41:30 +11:00