diff options
| author | Patrick Barron <barronpm@gmail.com> | 2021-03-14 10:19:35 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2021-03-14 10:19:35 -0400 |
| commit | e5380c653b0584a3b5d61da1a9b005d6155694cb (patch) | |
| tree | 328459396c783e8c61214c8d960d8ba07b5773f6 /Jellyfin.Api/Controllers/ConfigurationController.cs | |
| parent | 7c413a323b0d22a59532687b854ea228d544ecb7 (diff) | |
| parent | 109f24514fac52c8f138c4913d7ef614ff1973a1 (diff) | |
Merge branch 'master' into ef-cleanup
# Conflicts:
# Jellyfin.Data/Entities/Libraries/MediaFileStream.cs
# Jellyfin.Data/Jellyfin.Data.csproj
Diffstat (limited to 'Jellyfin.Api/Controllers/ConfigurationController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/ConfigurationController.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Jellyfin.Api/Controllers/ConfigurationController.cs b/Jellyfin.Api/Controllers/ConfigurationController.cs index e1c9f69f6..049a4bed7 100644 --- a/Jellyfin.Api/Controllers/ConfigurationController.cs +++ b/Jellyfin.Api/Controllers/ConfigurationController.cs @@ -25,7 +25,7 @@ namespace Jellyfin.Api.Controllers private readonly IServerConfigurationManager _configurationManager; private readonly IMediaEncoder _mediaEncoder; - private readonly JsonSerializerOptions _serializerOptions = JsonDefaults.GetOptions(); + private readonly JsonSerializerOptions _serializerOptions = JsonDefaults.Options; /// <summary> /// Initializes a new instance of the <see cref="ConfigurationController"/> class. |