alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 00:55:13 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source 
Conflicts:
	MediaBrowser.Common.Implementations/Archiving/ZipClient.cs
	MediaBrowser.Model/IO/IZipClient.cs
This commit is contained in:
Luke Pulverenti
2014-12-28 23:13:03 -05:00
parent 726cf9697a c9bf564c45
commit 55a726cdef
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Common.Implementations/Archiving/ZipClient.cs
View File

@@ -63,7 +63,7 @@ namespace MediaBrowser.Common.Implementations.Archiving
reader.WriteAllToDirectory(targetPath, options);
}
}
/// <summary>
/// Extracts all from7z.
/// </summary>