Merge branch 'develop' into feature/subtitles

Browse Source

...

This commit is contained in:

Sam Potts

2017-03-25 18:43:36 +11:00

committed by GitHub

parent 47b53fffb4 b083bf4297

commit 33fef7faee

13 changed files with 274 additions and 130 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

dist/plyr.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long

dist/plyr.js

Vendored

+2 -2

File diff suppressed because one or more lines are too long