Merge branch 'master' into media-type

This commit is contained in:
Cody Robibero
2023-11-09 22:03:55 -07:00
committed by GitHub
341 changed files with 6212 additions and 2500 deletions

View File

@@ -25,7 +25,7 @@ namespace Emby.Server.Implementations.Playlists
public override bool SupportsInheritedParentImages => false;
[JsonIgnore]
public override string CollectionType => MediaBrowser.Model.Entities.CollectionType.Playlists;
public override CollectionType? CollectionType => Jellyfin.Data.Enums.CollectionType.Playlists;
protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
{