diff options
| author | crobibero <cody@robibe.ro> | 2020-07-06 10:00:23 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-07-06 10:00:23 -0600 |
| commit | b2e7a4a1cb335e7281f7857cc88fadd6b671dcb4 (patch) | |
| tree | f5f8769b907cf183b1309acec891641e0ec954cb /Jellyfin.Api/Controllers/VideosController.cs | |
| parent | 068725cdedecc88bcde9f18c68b9b1e5c0f6e569 (diff) | |
| parent | 613444a152ecede061d229cbd0d528d88915db7b (diff) | |
Merge remote-tracking branch 'upstream/api-migration' into api-channel
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)) |