mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 03:26:07 +02:00
Conflicts: MediaBrowser.Controller/Entities/BaseItem.cs MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-apiclient/.bower.json MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/.bower.json MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/bower.json MediaBrowser.WebDashboard/dashboard-ui/strings/html/kk.json MediaBrowser.WebDashboard/dashboard-ui/strings/html/ru.json MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/kk.json MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ru.json SharedVersion.cs |
||
---|---|---|
.. | ||
ArtistsService.cs | ||
BaseItemsByNameService.cs | ||
BaseItemsRequest.cs | ||
GameGenresService.cs | ||
GenresService.cs | ||
ItemsService.cs | ||
MusicGenresService.cs | ||
PersonsService.cs | ||
PlaystateService.cs | ||
StudiosService.cs | ||
UserLibraryService.cs | ||
UserViewsService.cs | ||
YearsService.cs |