aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/Devices/DeviceOptions.cs
diff options
context:
space:
mode:
authorVasily <just.one.man@yandex.ru>2020-06-08 14:44:21 +0300
committerVasily <just.one.man@yandex.ru>2020-06-08 14:44:21 +0300
commit4999831604abc49964833a3ea837effde401273b (patch)
treecfcfaf258689ce07416503a5bc033b2a578c1338 /MediaBrowser.Model/Devices/DeviceOptions.cs
parent8be13b63d494e6541bed075538f84e77202f6c7b (diff)
parent99c9d99db76f1f3ffa4c7c3353911bf9c51ec061 (diff)
Merge remote-tracking branch 'upstream/master' into hwaccel
Diffstat (limited to 'MediaBrowser.Model/Devices/DeviceOptions.cs')
-rw-r--r--MediaBrowser.Model/Devices/DeviceOptions.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Model/Devices/DeviceOptions.cs b/MediaBrowser.Model/Devices/DeviceOptions.cs
index 8b77fd7fc3..037ffeb5e8 100644
--- a/MediaBrowser.Model/Devices/DeviceOptions.cs
+++ b/MediaBrowser.Model/Devices/DeviceOptions.cs
@@ -4,6 +4,6 @@ namespace MediaBrowser.Model.Devices
{
public class DeviceOptions
{
- public string CustomName { get; set; }
+ public string? CustomName { get; set; }
}
}