mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 20:08:59 +02:00
# Conflicts: # Jellyfin.Server.Implementations/Security/AuthorizationContext.cs # MediaBrowser.Controller/Library/IUserManager.cs # MediaBrowser.Controller/Security/IAuthenticationRepository.cs # MediaBrowser.Controller/Session/ISessionManager.cs |
||
---|---|---|
.. | ||
AddDefaultPluginRepository.cs | ||
AddPeopleQueryIndex.cs | ||
CreateUserLoggingConfigFile.cs | ||
DisableTranscodingThrottling.cs | ||
MigrateActivityLogDb.cs | ||
MigrateAuthenticationDb.cs | ||
MigrateDisplayPreferencesDb.cs | ||
MigrateUserDb.cs | ||
ReaddDefaultPluginRepository.cs | ||
RemoveDownloadImagesInAdvance.cs | ||
RemoveDuplicateExtras.cs |