diff options
| author | crobibero <cody@robibe.ro> | 2020-06-16 18:30:10 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-16 18:30:10 -0600 |
| commit | a639663aa78405644a02fbdd25411874b6cb2ab4 (patch) | |
| tree | f5601fd9f3c9f07f5991fdf4ee1ff2c8d795ac34 /MediaBrowser.Controller/Collections | |
| parent | 7b54a43cc11964bffd9eaf8bad79a28b5845cc9c (diff) | |
| parent | 215ab39e00be3a79875351a76f0d836a9281ce6b (diff) | |
Merge remote-tracking branch 'upstream/master' into warning-local-metadata
Diffstat (limited to 'MediaBrowser.Controller/Collections')
| -rw-r--r-- | MediaBrowser.Controller/Collections/CollectionCreationOptions.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Collections/ICollectionManager.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/Collections/CollectionCreationOptions.cs b/MediaBrowser.Controller/Collections/CollectionCreationOptions.cs index 51fe4ce290..1e7549d2bc 100644 --- a/MediaBrowser.Controller/Collections/CollectionCreationOptions.cs +++ b/MediaBrowser.Controller/Collections/CollectionCreationOptions.cs @@ -15,6 +15,7 @@ namespace MediaBrowser.Controller.Collections public Dictionary<string, string> ProviderIds { get; set; } public string[] ItemIdList { get; set; } + public Guid[] UserIds { get; set; } public CollectionCreationOptions() diff --git a/MediaBrowser.Controller/Collections/ICollectionManager.cs b/MediaBrowser.Controller/Collections/ICollectionManager.cs index cfe8493d33..701423c0f3 100644 --- a/MediaBrowser.Controller/Collections/ICollectionManager.cs +++ b/MediaBrowser.Controller/Collections/ICollectionManager.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using Jellyfin.Data.Entities; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; |