Merge branch 'dev' into code-cleanup

This commit is contained in:
Erwin de Haan
2019-01-11 12:50:36 +01:00
345 changed files with 2991 additions and 3236 deletions

View File

@@ -2100,7 +2100,7 @@ namespace MediaBrowser.Controller.Entities
}
else
{
var list =
var list =
Studios = current.Concat(new [] { name }).ToArray();
}
}
@@ -2915,7 +2915,7 @@ namespace MediaBrowser.Controller.Entities
return GetExtras();
}
public virtual bool IsHD {
public virtual bool IsHD {
get
{
return Height >= 720;