Merge branch 'develop' into css-variables

Browse Source

# Conflicts:
#	demo/dist/demo.css
#	demo/index.html
#	dist/plyr.css
#	gulpfile.js
#	package.json
#	yarn.lock

...

This commit is contained in:

Sam Potts

2019-03-16 12:14:20 +11:00

parent bdd513635f c202551e6d

commit 35f7ee9c59

56 changed files with 24998 additions and 14943 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

+1990 -820

File diff suppressed because it is too large Load Diff

dist/plyr.js.map

Vendored

-1

File diff suppressed because one or more lines are too long

dist/plyr.min.js

Vendored

-2

File diff suppressed because one or more lines are too long

dist/plyr.min.js.map

Vendored

+1 -1

File diff suppressed because one or more lines are too long

dist/plyr.min.mjs

Vendored

dist/plyr.min.mjs.map

Vendored

+1

File diff suppressed because one or more lines are too long

dist/plyr.mjs

Vendored

+8918

File diff suppressed because it is too large Load Diff

dist/plyr.polyfilled.js

Vendored

-10448

File diff suppressed because it is too large Load Diff

dist/plyr.polyfilled.js.map

Vendored

-1

File diff suppressed because one or more lines are too long

dist/plyr.polyfilled.min.js

Vendored

-2

File diff suppressed because one or more lines are too long

dist/plyr.polyfilled.min.js.map

Vendored

-1

File diff suppressed because one or more lines are too long

dist/plyr.svg

Vendored

+1 -1

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.4 KiB