Dmitry Lyzo 48886918d3 Merge remote-tracking branch 'upstream/master' into fix-subtitle-line-spacing ...

Conflicts:
	src/components/subtitlesettings/subtitleappearancehelper.js
	src/plugins/htmlVideoPlayer/plugin.js

2020-07-30 17:57:33 +03:00

..

plugin.js

Merge remote-tracking branch 'upstream/master' into fix-subtitle-line-spacing

2020-07-30 17:57:33 +03:00

style.css

Add subtitle position

2020-07-07 01:10:55 +03:00