Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts: MediaBrowser.Common.Implementations/Archiving/ZipClient.cs MediaBrowser.Model/IO/IZipClient.cs
This commit is contained in:
commit
55a726cdef
Conflicts: MediaBrowser.Common.Implementations/Archiving/ZipClient.cs MediaBrowser.Model/IO/IZipClient.cs