55a726cdef
Conflicts: MediaBrowser.Common.Implementations/Archiving/ZipClient.cs MediaBrowser.Model/IO/IZipClient.cs |
||
---|---|---|
.. | ||
Archiving | ||
Configuration | ||
Devices | ||
HttpClientManager | ||
IO | ||
Logging | ||
Networking | ||
Properties | ||
ScheduledTasks | ||
Security | ||
Serialization | ||
Updates | ||
BaseApplicationHost.cs | ||
BaseApplicationPaths.cs | ||
MediaBrowser.Common.Implementations.csproj | ||
packages.config |