7a115024aa
# Conflicts: # MediaBrowser.Controller/Library/ILibraryManager.cs # MediaBrowser.Providers/Users/UserMetadataService.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 |