Merge branch 'master' into develop

Browse Source

# Conflicts:
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map

...

This commit is contained in:

Sam Potts

2018-06-11 16:48:54 +10:00

parent abd1182303 efe70ab48e

commit 38f954ef17

16 changed files with 489 additions and 434 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.polyfilled.min.js vendored

File diff suppressed because one or more lines are too long