Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into es6-subtitlesettings

Browse source

Signed-off-by: Christoph Potas <christoph286@googlemail.com>

# Conflicts:
#	package.json
#	src/components/subtitlesettings/subtitleappearancehelper.js
#	src/components/subtitlesettings/subtitlesettings.js
#	src/controllers/user/subtitles.js
#	src/scripts/site.js

...

This commit is contained in:

Christoph Potas 2020-05-09 15:37:07 +02:00

parent e5bf9bc074 fb7a19d85d

commit 1007308add

328 changed files with 10578 additions and 13979 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

836

src/scripts/site.js

View file

File diff suppressed because it is too large Load diff