Merge branch 'beta' into fix/ads-blocked

Browse Source

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

...

This commit is contained in:

Sam Potts

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

parent afd695cb39 8f7a8940f3

commit 71efbe7a92

19 changed files with 112 additions and 68 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

dist/plyr.js vendored

File diff suppressed because one or more lines are too long

2

dist/plyr.js.map vendored

File diff suppressed because one or more lines are too long