Sam Potts cfc86bcb7c Merge branch 'beta' into beta-with-ads ...

# Conflicts:
#	demo/dist/demo.js
#	demo/dist/demo.js.map
#	dist/plyr.js
#	dist/plyr.js.map

2018-01-14 22:55:44 +11:00

..

demo.css

Fix loading google ima sdk

2018-01-14 08:21:35 +01:00

demo.js

Merge branch 'beta' into beta-with-ads

2018-01-14 22:55:44 +11:00

demo.js.map

Merge branch 'beta' into beta-with-ads

2018-01-14 22:55:44 +11:00