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

Browse source

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

...

This commit is contained in:

Dmitry Lyzo 2020-07-30 17:49:07 +03:00

parent 270b717cd0 e7180e2633

commit 48886918d3

278 changed files with 2125 additions and 5109 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

1705

src/plugins/htmlVideoPlayer/plugin.js

View file

File diff suppressed because it is too large Load diff