diff options
| author | adrez99 <59739805+adrez99@users.noreply.github.com> | 2022-10-11 18:15:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-11 18:15:28 +0200 |
| commit | 177f53444d7f0d6541b660c4afb8d46c5614472c (patch) | |
| tree | b2d7ef47f415ccb3d5090a25fdcb612d0a55b25c /MediaBrowser.Controller/Entities/BasePluginFolder.cs | |
| parent | b8afdd892af01fd99011a6dc3df65cfb762084d6 (diff) | |
| parent | d50c1b2d4bc0c85428671b288adef1b336da1156 (diff) | |
Merge branch 'jellyfin:master' into gzip
Diffstat (limited to 'MediaBrowser.Controller/Entities/BasePluginFolder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BasePluginFolder.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs index 272a37df1..afafaf1c2 100644 --- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs +++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs @@ -1,5 +1,3 @@ -#nullable disable - #pragma warning disable CS1591 using System.Text.Json.Serialization; @@ -13,7 +11,7 @@ namespace MediaBrowser.Controller.Entities public abstract class BasePluginFolder : Folder, ICollectionFolder { [JsonIgnore] - public virtual string CollectionType => null; + public virtual string? CollectionType => null; [JsonIgnore] public override bool SupportsInheritedParentImages => false; |