aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common/Json/JsonDefaults.cs
diff options
context:
space:
mode:
authorCody Robibero <cody@robibe.ro>2020-12-30 18:11:37 -0700
committerGitHub <noreply@github.com>2020-12-30 18:11:37 -0700
commit5c575696921a02ae85c04a15142ad86000fd8361 (patch)
treef6741e1ea97a808d5972779019561312a6ca05ce /MediaBrowser.Common/Json/JsonDefaults.cs
parent21f6d3943264b0f6a59f3312e9ec34a3b6269af2 (diff)
parentccc1b8bf9206221d681e60f0831b7b01381250be (diff)
Merge branch 'master' into PluginDowngrade
Diffstat (limited to 'MediaBrowser.Common/Json/JsonDefaults.cs')
-rw-r--r--MediaBrowser.Common/Json/JsonDefaults.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/MediaBrowser.Common/Json/JsonDefaults.cs b/MediaBrowser.Common/Json/JsonDefaults.cs
index 67c3dfe546..9a2ea68757 100644
--- a/MediaBrowser.Common/Json/JsonDefaults.cs
+++ b/MediaBrowser.Common/Json/JsonDefaults.cs
@@ -35,6 +35,7 @@ namespace MediaBrowser.Common.Json
Converters =
{
new JsonGuidConverter(),
+ new JsonNullableGuidConverter(),
new JsonVersionConverter(),
new JsonStringEnumConverter(),
new JsonNullableStructConverterFactory(),