Merge branch 'master' into develop

Browse Source

# Conflicts:
#	dist/plyr.css
#	dist/plyr.js

...

This commit is contained in:

Sam Potts

2015-06-27 16:21:38 +10:00

parent 398815857f 654e9cd623

commit 240aa7aa5f

13 changed files with 433 additions and 133 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.3 KiB