diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-10-27 13:52:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-27 13:52:08 -0400 |
| commit | 53ee78170ad3d5d5d0ecac2dbe8dcbfb13940e46 (patch) | |
| tree | 1ad4126058814609352d41b78662fd5838d6677a /MediaBrowser.Controller/Session | |
| parent | 2cdf5c203a9335100b19b9609a738e1b64d6631d (diff) | |
| parent | c9f4a74af02e08b895cd6a8b8a408b1c0edfb6c4 (diff) | |
Merge branch 'master' into copr-fix
Diffstat (limited to 'MediaBrowser.Controller/Session')
| -rw-r--r-- | MediaBrowser.Controller/Session/SessionInfo.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs index f0e81e8e7..acda6a416 100644 --- a/MediaBrowser.Controller/Session/SessionInfo.cs +++ b/MediaBrowser.Controller/Session/SessionInfo.cs @@ -1,9 +1,9 @@ using System; using System.Linq; +using System.Text.Json.Serialization; using System.Threading; using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Dto; -using MediaBrowser.Model.Serialization; using MediaBrowser.Model.Session; using Microsoft.Extensions.Logging; @@ -123,7 +123,7 @@ namespace MediaBrowser.Controller.Session /// Gets or sets the session controller. /// </summary> /// <value>The session controller.</value> - [IgnoreDataMember] + [JsonIgnore] public ISessionController[] SessionControllers { get; set; } /// <summary> |
