Christoph Potas 1007308add Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into es6-subtitlesettings ... 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		2020-05-09 15:37:07 +02:00
..
subtitleappearancehelper.js	Force the use of single quotes	2020-05-04 12:44:12 +02:00
subtitlesettings.js	Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into es6-subtitlesettings	2020-05-09 15:37:07 +02:00
subtitlesettings.template.html	Add missing final newlines	2020-02-22 11:47:03 -05:00