update merge
This commit is contained in:
parent
4492dcc592
commit
d3b8557ab6
|
@ -290,4 +290,4 @@ namespace MediaBrowser.Server.Implementations.Devices
|
|||
return config.GetConfiguration<DevicesOptions>("devices");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -582,4 +582,4 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||
public MediaSourceInfo MediaSource;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -515,4 +515,4 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
|
|||
return !validCollectionTypes.Contains(collectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user