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

Conflicts:
	src/components/subtitlesettings/subtitleappearancehelper.js
	src/components/subtitlesettings/subtitlesettings.js
	src/elements/emby-slider/emby-slider.js

2020-07-26 13:35:17 +03:00

..

subtitleappearancehelper.js

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

2020-07-26 13:35:17 +03:00

subtitlesettings.js

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

2020-07-26 13:35:17 +03:00

subtitlesettings.template.html

Add subtitle position

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