Merge branch 'master' into develop

Browse Source

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

...

This commit is contained in:

Sam Potts

2016-05-10 10:01:29 +10:00

parent 3f20462943 4d67d68c6b

commit d351f9f172

3 changed files with 5 additions and 1 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