1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
jellyfin-web/src/controllers
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
..
auth Force the use of single quotes 2020-05-04 12:44:12 +02:00
dashboard Force the use of single quotes 2020-05-04 12:44:12 +02:00
livetv Force the use of single quotes 2020-05-04 12:44:12 +02:00
movies Merge remote-tracking branch 'upstream/master' into lazyloader 2020-05-07 11:01:14 +02:00
music Force the use of single quotes 2020-05-04 12:44:12 +02:00
playback Force the use of single quotes 2020-05-04 12:44:12 +02:00
shows Merge remote-tracking branch 'upstream/master' into lazyloader 2020-05-07 11:01:14 +02:00
user Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into es6-subtitlesettings 2020-05-09 15:37:07 +02:00
wizard Force the use of single quotes 2020-05-04 12:44:12 +02:00
edititemmetadata.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
favorites.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
home.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
hometab.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
itemdetailpage.js Merge remote-tracking branch 'upstream/master' into lazyloader 2020-05-07 11:01:14 +02:00
list.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
livetvguideprovider.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
livetvsettings.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
livetvstatus.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
livetvtuner.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
searchpage.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
useredit.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
userlibraryaccess.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
usernew.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
userparentalcontrol.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
userpasswordpage.js Force the use of single quotes 2020-05-04 12:44:12 +02:00
userprofilespage.js Force the use of single quotes 2020-05-04 12:44:12 +02:00