jellyfin-server/MediaBrowser.Server.Implementations/Configuration
Luke Pulverenti 106a2f3e1a add back MergeMetadataAndImagesByName
Conflicts:
	MediaBrowser.Model/Configuration/ServerConfiguration.cs
2016-01-27 01:33:59 -05:00
..
ServerConfigurationManager.cs add back MergeMetadataAndImagesByName 2016-01-27 01:33:59 -05:00