Files
jellyfin-jellyfin-1/MediaBrowser.Model/Configuration
Luke Pulverenti 106a2f3e1a add back MergeMetadataAndImagesByName
Conflicts:
	MediaBrowser.Model/Configuration/ServerConfiguration.cs
2016-01-27 01:33:59 -05:00
..
2015-08-21 12:54:11 -04:00
2015-11-25 12:39:58 -05:00
2016-01-09 12:51:57 -05:00
2015-01-18 00:45:10 -05:00
2014-10-24 00:54:35 -04:00
2014-06-23 12:05:19 -04:00
2014-10-08 19:31:44 -04:00
2015-12-26 12:03:39 -05:00
2015-01-18 00:45:10 -05:00
2015-01-18 00:45:10 -05:00
2015-12-29 11:30:53 -05:00