Merge branch 'master' into culture

This commit is contained in:
Bond-009
2019-01-30 16:57:15 +01:00
committed by GitHub
121 changed files with 536 additions and 887 deletions

View File

@@ -345,7 +345,7 @@ namespace MediaBrowser.Controller.Entities
{
if (IsStacked)
{
return FileSystem.GetDirectoryName(Path);
return System.IO.Path.GetDirectoryName(Path);
}
if (!IsPlaceHolder)