Merge branch 'master' into develop

Browse Source

# Conflicts:
#	dist/plyr.css
#	dist/plyr.js
#	docs/dist/docs.css
#	docs/src/less/components/examples.less
#	src/js/plyr.js

...

This commit is contained in:

Sam Potts

2015-08-27 07:36:17 +10:00

parent 0785ca6024 6543fc1e5b

commit 95e39e7bd7

32 changed files with 675 additions and 370 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/sprite.svg vendored

File diff suppressed because one or more lines are too long

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.3 KiB After Width:  |  Height:  |  Size: 5.1 KiB