Merge branch 'master' into develop

Browse Source

# Conflicts:
#	dist/plyr.css
#	src/less/plyr.less

...

This commit is contained in:

Sam

2016-05-11 22:47:27 +10:00

parent d351f9f172 31c933af38

commit 4a69ef3874

9 changed files with 78 additions and 38 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.css vendored

File diff suppressed because one or more lines are too long