diff options
| author | Patrick Barron <barronpm@gmail.com> | 2020-06-04 16:39:50 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2020-06-04 16:52:23 -0400 |
| commit | 06f9cde22f32c65b6b4d1713149de2de2be60000 (patch) | |
| tree | 9600bba80c72d259360079d965511e010be739a5 /MediaBrowser.Model/SyncPlay | |
| parent | 585fdbad396a089e11717eb6ce52e60a07e900e9 (diff) | |
| parent | 836741f2aa6d2140051a50f746602e4b8c63a231 (diff) | |
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
# Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
# Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
# Emby.Server.Implementations/TV/TVSeriesManager.cs
# Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
Diffstat (limited to 'MediaBrowser.Model/SyncPlay')
| -rw-r--r-- | MediaBrowser.Model/SyncPlay/GroupInfoView.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/SyncPlay/GroupUpdate.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/SyncPlay/SendCommand.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/SyncPlay/UtcTimeResponse.cs | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/MediaBrowser.Model/SyncPlay/GroupInfoView.cs b/MediaBrowser.Model/SyncPlay/GroupInfoView.cs index f28ecf16df..f4c6859988 100644 --- a/MediaBrowser.Model/SyncPlay/GroupInfoView.cs +++ b/MediaBrowser.Model/SyncPlay/GroupInfoView.cs @@ -1,3 +1,5 @@ +#nullable disable + using System.Collections.Generic; namespace MediaBrowser.Model.SyncPlay diff --git a/MediaBrowser.Model/SyncPlay/GroupUpdate.cs b/MediaBrowser.Model/SyncPlay/GroupUpdate.cs index 895702f3dd..8c7208211c 100644 --- a/MediaBrowser.Model/SyncPlay/GroupUpdate.cs +++ b/MediaBrowser.Model/SyncPlay/GroupUpdate.cs @@ -1,3 +1,5 @@ +#nullable disable + namespace MediaBrowser.Model.SyncPlay { /// <summary> diff --git a/MediaBrowser.Model/SyncPlay/SendCommand.cs b/MediaBrowser.Model/SyncPlay/SendCommand.cs index 0f06e381f1..0f0be0152d 100644 --- a/MediaBrowser.Model/SyncPlay/SendCommand.cs +++ b/MediaBrowser.Model/SyncPlay/SendCommand.cs @@ -1,3 +1,5 @@ +#nullable disable + namespace MediaBrowser.Model.SyncPlay { /// <summary> diff --git a/MediaBrowser.Model/SyncPlay/UtcTimeResponse.cs b/MediaBrowser.Model/SyncPlay/UtcTimeResponse.cs index 0a60361544..8ec5eaab3b 100644 --- a/MediaBrowser.Model/SyncPlay/UtcTimeResponse.cs +++ b/MediaBrowser.Model/SyncPlay/UtcTimeResponse.cs @@ -1,3 +1,5 @@ +#nullable disable + namespace MediaBrowser.Model.SyncPlay { /// <summary> |