You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Patrick Barron 01ce56016a Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj # MediaBrowser.Api/UserService.cs # MediaBrowser.Controller/Library/IUserManager.cs		5 years ago
..
Attachments	…
Devices	…
Images	…
Library	…
LiveTv	…
Movies	…
Music	…
Playback	…
Properties	…
ScheduledTasks	…
Sessions	…
Subtitles	…
SyncPlay	…
System	…
UserLibrary	…
ApiEntryPoint.cs	…
BaseApiService.cs	…
BrandingService.cs	…
ChannelService.cs	…
ConfigurationService.cs	…
DisplayPreferencesService.cs	…
EnvironmentService.cs	…
FilterService.cs	…
IHasDtoOptions.cs	…
IHasItemFields.cs	…
ItemLookupService.cs	…
ItemRefreshService.cs	…
ItemUpdateService.cs	…
LocalizationService.cs	…
MediaBrowser.Api.csproj	…
PackageService.cs	…
PlaylistService.cs	…
PluginService.cs	…
SearchService.cs	…
SimilarItemsHelper.cs	…
SuggestionsService.cs	…
TranscodingJob.cs	…
TvShowsService.cs	…
UserService.cs	Merge branch 'master' into userdb-efcore	5 years ago
VideosService.cs	…