diff options
| author | Cody Robibero <cody@robibe.ro> | 2023-11-09 22:03:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 22:03:55 -0700 |
| commit | 892973a9e372000ad7babe2381e4e83b39591951 (patch) | |
| tree | fc408136c09e6377309629ad6b2d4b2b26ff3c3f /MediaBrowser.Controller/Entities/CollectionFolder.cs | |
| parent | 35bd0c00c965176d6ddb167605ed3a3eba9a4524 (diff) | |
| parent | 44b771bfb4b6412360b18c80621c90902c0a43a7 (diff) | |
Merge branch 'master' into media-type
Diffstat (limited to 'MediaBrowser.Controller/Entities/CollectionFolder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/CollectionFolder.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs index f51162f9d..992bb19bb 100644 --- a/MediaBrowser.Controller/Entities/CollectionFolder.cs +++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs @@ -11,6 +11,7 @@ using System.Text.Json; using System.Text.Json.Serialization; using System.Threading; using System.Threading.Tasks; +using Jellyfin.Data.Enums; using Jellyfin.Extensions.Json; using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; @@ -69,7 +70,7 @@ namespace MediaBrowser.Controller.Entities [JsonIgnore] public override bool SupportsInheritedParentImages => false; - public string CollectionType { get; set; } + public CollectionType? CollectionType { get; set; } /// <summary> /// Gets the item's children. |