Sam Potts 2458eaa11b Merge branch 'develop' into css-variables ...

# Conflicts:
#	src/js/captions.js
#	src/js/config/defaults.js
#	src/js/fullscreen.js
#	src/js/listeners.js
#	src/js/plyr.js

2020-04-24 00:22:17 +10:00

..

dist

Converted to 2 space indentation

2020-04-11 16:23:14 +10:00

media

Controls cleanup, work on captions bug, click to invert time

2017-11-18 19:30:26 +11:00

src

Merge branch 'develop' into css-variables

2020-04-24 00:22:17 +10:00

error.html

Style fixes

2018-04-04 16:50:00 +10:00

index.html

Poster image fix (fixes #1763)

2020-04-19 20:06:58 +10:00

package.json

Sentry upgrade for demo

2020-03-30 23:39:01 +11:00

yarn.lock

Sentry upgrade for demo

2020-03-30 23:39:01 +11:00