diff options
| author | crobibero <cody@robibe.ro> | 2020-08-23 07:53:33 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-08-23 07:53:33 -0600 |
| commit | cb44f16068bb66db7e35e473530c0a85583c2511 (patch) | |
| tree | 0f41bf313fded94e3da067faa84ddffee505613d /MediaBrowser.Common/Json/JsonDefaults.cs | |
| parent | 4a64819277b98ac98ba0051c49fcf0cbfe16319c (diff) | |
| parent | f9bb79285b672e63054b4ab1b49b744606851c34 (diff) | |
Merge remote-tracking branch 'upstream/master' into output-formatters
Diffstat (limited to 'MediaBrowser.Common/Json/JsonDefaults.cs')
| -rw-r--r-- | MediaBrowser.Common/Json/JsonDefaults.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MediaBrowser.Common/Json/JsonDefaults.cs b/MediaBrowser.Common/Json/JsonDefaults.cs index 36ab6d900..0a661934e 100644 --- a/MediaBrowser.Common/Json/JsonDefaults.cs +++ b/MediaBrowser.Common/Json/JsonDefaults.cs @@ -29,9 +29,11 @@ namespace MediaBrowser.Common.Json options.Converters.Add(new JsonGuidConverter()); options.Converters.Add(new JsonInt32Converter()); + options.Converters.Add(new JsonNullableInt32Converter()); options.Converters.Add(new JsonStringEnumConverter()); options.Converters.Add(new JsonNonStringKeyDictionaryConverterFactory()); options.Converters.Add(new JsonInt64Converter()); + options.Converters.Add(new JsonNullableInt64Converter()); options.Converters.Add(new JsonDoubleConverter()); return options; |