diff options
| author | crobibero <cody@robibe.ro> | 2020-06-29 12:54:47 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-29 12:54:47 -0600 |
| commit | da405729799c426a446bf1705262286e780f8f7f (patch) | |
| tree | 07c4ac3aa885575652d2925647f3a6667caeb272 /Jellyfin.Api/Controllers/VideosController.cs | |
| parent | 325808d271a1e53bcf3b15f17b0111c0ce306698 (diff) | |
| parent | dbf939467fae7106afc722b31f43bfb950945664 (diff) | |
Merge remote-tracking branch 'upstream/api-migration' into api-studios
Diffstat (limited to 'Jellyfin.Api/Controllers/VideosController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/VideosController.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Jellyfin.Api/Controllers/VideosController.cs b/Jellyfin.Api/Controllers/VideosController.cs index effe630a9..fb1141984 100644 --- a/Jellyfin.Api/Controllers/VideosController.cs +++ b/Jellyfin.Api/Controllers/VideosController.cs @@ -133,7 +133,7 @@ namespace Jellyfin.Api.Controllers [Authorize(Policy = Policies.RequiresElevation)] [ProducesResponseType(StatusCodes.Status204NoContent)] [ProducesResponseType(StatusCodes.Status400BadRequest)] - public ActionResult MergeVersions([FromQuery] string itemIds) + public ActionResult MergeVersions([FromQuery] string? itemIds) { var items = RequestHelpers.Split(itemIds, ',', true) .Select(i => _libraryManager.GetItemById(i)) |