Sam Potts 38f954ef17 Merge branch 'master' into develop ...

# Conflicts:
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map

2018-06-11 16:48:54 +10:00

..

js

Merge branch 'master' into develop

2018-06-11 16:48:54 +10:00

sass

Fix #1003: Formatted captions issue

2018-06-10 18:56:13 +02:00

sprite

Work on PiP

2016-10-23 21:21:42 +11:00