mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-17 10:58:58 -07:00
be88efce3c
# Conflicts: # Emby.Server.Implementations/Devices/DeviceManager.cs # Emby.Server.Implementations/HttpServer/Security/SessionContext.cs # Emby.Server.Implementations/Security/AuthenticationRepository.cs # Emby.Server.Implementations/Session/SessionManager.cs # Jellyfin.Server.Implementations/Security/AuthorizationContext.cs # MediaBrowser.Controller/Library/IUserManager.cs # MediaBrowser.Controller/Net/ISessionContext.cs |
||
---|---|---|
.. | ||
AddDefaultPluginRepository.cs | ||
AddPeopleQueryIndex.cs | ||
CreateUserLoggingConfigFile.cs | ||
DisableTranscodingThrottling.cs | ||
MigrateActivityLogDb.cs | ||
MigrateAuthenticationDb.cs | ||
MigrateDisplayPreferencesDb.cs | ||
MigrateUserDb.cs | ||
ReaddDefaultPluginRepository.cs | ||
RemoveDownloadImagesInAdvance.cs | ||
RemoveDuplicateExtras.cs |