Merge branch 'jellyfin:master' into master

1 files changed, 0 insertions, 40 deletions

diff --git a/MediaBrowser.Api/BrandingService.cs b/MediaBrowser.Api/BrandingService.cs
deleted file mode 100644
index f5845f4e0..000000000
--- a/MediaBrowser.Api/BrandingService.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Model.Branding;
-using MediaBrowser.Model.Services;
-
-namespace MediaBrowser.Api
-{
-    [Route("/Branding/Configuration", "GET", Summary = "Gets branding configuration")]
-    public class GetBrandingOptions : IReturn<BrandingOptions>
-    {
-    }
-
-    [Route("/Branding/Css", "GET", Summary = "Gets custom css")]
-    [Route("/Branding/Css.css", "GET", Summary = "Gets custom css")]
-    public class GetBrandingCss
-    {
-    }
-
-    public class BrandingService : BaseApiService
-    {
-        private readonly IConfigurationManager _config;
-
-        public BrandingService(IConfigurationManager config)
-        {
-            _config = config;
-        }
-
-        public object Get(GetBrandingOptions request)
-        {
-            return _config.GetConfiguration<BrandingOptions>("branding");
-        }
-
-        public object Get(GetBrandingCss request)
-        {
-            var result = _config.GetConfiguration<BrandingOptions>("branding");
-
-            // When null this throws a 405 error under Mono OSX, so default to empty string
-            return ResultFactory.GetResult(Request, result.CustomCss ?? string.Empty, "text/css");
-        }
-    }
-}