alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 18:14:42 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into simplify-https-config

Browse Source 
Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798
This commit is contained in:
Mark Monteiro
2020-04-26 17:37:30 -04:00
parent cabdec87e8 241dea6706
commit 679f97d5e9
28 changed files with 136 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Controller/IServerApplicationPaths.cs
View File

@@ -71,7 +71,12 @@ namespace MediaBrowser.Controller
string UserConfigurationDirectoryPath { get; }
/// <summary>
/// Gets the internal metadata path.
/// Gets the default internal metadata path.
/// </summary>
string DefaultInternalMetadataPath { get; }
/// <summary>
/// Gets the internal metadata path, either a custom path or the default.
/// </summary>
/// <value>The internal metadata path.</value>
string InternalMetadataPath { get; }