diff options
| author | crobibero <cody@robibe.ro> | 2020-06-13 13:03:09 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-13 13:03:09 -0600 |
| commit | 829eb1a8494b3d0a4a5170f5942f33920f179e73 (patch) | |
| tree | 50acc3d0800da593aac0a252dad6226c73f3c1d5 /Jellyfin.Api/BaseJellyfinApiController.cs | |
| parent | d975ad155e7857bcbfcf55246fd78dd87ed594ca (diff) | |
| parent | 403cd3205ffb970cfda88b6c49dc69127fada798 (diff) | |
merge master into api-migration
Diffstat (limited to 'Jellyfin.Api/BaseJellyfinApiController.cs')
| -rw-r--r-- | Jellyfin.Api/BaseJellyfinApiController.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Jellyfin.Api/BaseJellyfinApiController.cs b/Jellyfin.Api/BaseJellyfinApiController.cs index 22b9c3fd6..615f330a4 100644 --- a/Jellyfin.Api/BaseJellyfinApiController.cs +++ b/Jellyfin.Api/BaseJellyfinApiController.cs @@ -1,4 +1,8 @@ +<<<<<<< HEAD using System; +======= +using System.Net.Mime; +>>>>>>> origin/master using Microsoft.AspNetCore.Mvc; namespace Jellyfin.Api @@ -8,6 +12,7 @@ namespace Jellyfin.Api /// </summary> [ApiController] [Route("[controller]")] + [Produces(MediaTypeNames.Application.Json)] public class BaseJellyfinApiController : ControllerBase { } |