diff options
| author | Patrick Barron <barronpm@gmail.com> | 2021-08-13 20:41:27 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2021-08-13 21:08:24 -0400 |
| commit | 45f478f63e21667fa03bd2bd5156a7094a799f47 (patch) | |
| tree | 29fbae969e392631eb478fc902f1a890cb959461 /MediaBrowser.Controller/Drawing/ImageStream.cs | |
| parent | 15baf04bd2bfc2850c4f516253f1925b40a02f5e (diff) | |
| parent | 04571e93f80ce707372c7fe811150133d288b9b7 (diff) | |
Merge branch 'master' into authenticationdb-efcore
# Conflicts:
# Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
# MediaBrowser.Controller/Library/IUserManager.cs
# MediaBrowser.Controller/Security/IAuthenticationRepository.cs
# MediaBrowser.Controller/Session/ISessionManager.cs
Diffstat (limited to 'MediaBrowser.Controller/Drawing/ImageStream.cs')
| -rw-r--r-- | MediaBrowser.Controller/Drawing/ImageStream.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Drawing/ImageStream.cs b/MediaBrowser.Controller/Drawing/ImageStream.cs index 5ee781ffa..5d552170f 100644 --- a/MediaBrowser.Controller/Drawing/ImageStream.cs +++ b/MediaBrowser.Controller/Drawing/ImageStream.cs @@ -1,4 +1,4 @@ -#pragma warning disable CS1591 +#pragma warning disable CA1711, CS1591 using System; using System.IO; |