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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files