mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-08 04:18:06 +02:00
# Conflicts: # Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs # Emby.Server.Implementations/ApplicationHost.cs # Emby.Server.Implementations/Devices/DeviceManager.cs # Jellyfin.Server/Jellyfin.Server.csproj # Jellyfin.Server/Migrations/MigrationRunner.cs # MediaBrowser.Controller/Devices/IDeviceManager.cs |
||
---|---|---|
.. | ||
AccessSchedule.cs | ||
BaseApplicationConfiguration.cs | ||
EncodingOptions.cs | ||
ImageOption.cs | ||
ImageSavingConvention.cs | ||
LibraryOptions.cs | ||
MetadataConfiguration.cs | ||
MetadataOptions.cs | ||
MetadataPlugin.cs | ||
MetadataPluginSummary.cs | ||
MetadataPluginType.cs | ||
ServerConfiguration.cs | ||
UserConfiguration.cs | ||
XbmcMetadataOptions.cs |