diff options
| author | Bond_009 <bond.009@outlook.com> | 2020-01-09 18:26:22 +0100 |
|---|---|---|
| committer | Bond_009 <bond.009@outlook.com> | 2020-01-09 18:26:22 +0100 |
| commit | b50c4938e19eaa4508dd9192bc63c3788c2fa3eb (patch) | |
| tree | e8a29d7c1ecc22b20287a940d757d635b5208b00 /MediaBrowser.Common/Json/JsonDefaults.cs | |
| parent | a1ca50fd5a74eafa6e609976d90cad42b54137e5 (diff) | |
| parent | 162c1ac7b7fde0e4929cf262b0f275e3eb15524c (diff) | |
Merge branch 'master' into namingtests
Diffstat (limited to 'MediaBrowser.Common/Json/JsonDefaults.cs')
| -rw-r--r-- | MediaBrowser.Common/Json/JsonDefaults.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Common/Json/JsonDefaults.cs b/MediaBrowser.Common/Json/JsonDefaults.cs index 4ba0d5a1a..4a6ee0a79 100644 --- a/MediaBrowser.Common/Json/JsonDefaults.cs +++ b/MediaBrowser.Common/Json/JsonDefaults.cs @@ -21,7 +21,7 @@ namespace MediaBrowser.Common.Json WriteIndented = false }; - options.Converters.Add(new GuidConverter()); + options.Converters.Add(new JsonGuidConverter()); options.Converters.Add(new JsonStringEnumConverter()); return options; |