diff options
| author | aled <aled@wibblr.com> | 2020-06-16 19:30:00 +0100 |
|---|---|---|
| committer | aled <aled@wibblr.com> | 2020-06-16 19:30:23 +0100 |
| commit | 05f736defb9b045ace57262d19ec3691414f8bfc (patch) | |
| tree | add6734a2275aeaa887d459153c7bab4b18ff61a /MediaBrowser.Api/EnvironmentService.cs | |
| parent | c722ad22ece5ee7dd68b41521c2716a50364f42a (diff) | |
| parent | 100e9d586dff877610c488936aa035f61f6fedb5 (diff) | |
Merge branch 'master' into check-stored-password-exists
# Conflicts:
# Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
Diffstat (limited to 'MediaBrowser.Api/EnvironmentService.cs')
| -rw-r--r-- | MediaBrowser.Api/EnvironmentService.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MediaBrowser.Api/EnvironmentService.cs b/MediaBrowser.Api/EnvironmentService.cs index 82d471412..fddf78465 100644 --- a/MediaBrowser.Api/EnvironmentService.cs +++ b/MediaBrowser.Api/EnvironmentService.cs @@ -100,7 +100,6 @@ namespace MediaBrowser.Api [Route("/Environment/DefaultDirectoryBrowser", "GET", Summary = "Gets the parent path of a given path")] public class GetDefaultDirectoryBrowser : IReturn<DefaultDirectoryBrowserInfo> { - } /// <summary> |