Files
jellyfin-web/src/plugins
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
..
2020-06-06 11:25:53 +02:00
2020-07-21 13:25:50 +01:00
2020-07-07 01:10:55 +03:00
2020-07-17 20:56:21 +01:00