Merge branch 'master' of github.com:sampotts/plyr

Browse Source

# Conflicts:
#	demo/dist/demo.css
#	dist/plyr.css
#	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-05-31 23:43:40 +10:00

parent 969a877a34 fb22a90d33

commit a4caba120c

26 changed files with 599 additions and 1889 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.min.js vendored

File diff suppressed because one or more lines are too long