Merge branch '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-21 09:11:05 +10:00

parent f62e1da01a e04b90c9c0

commit 17dcb63c26

21 changed files with 317 additions and 271 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

demo/dist/demo.min.js vendored

File diff suppressed because one or more lines are too long