mirror of
https://github.com/Sonarr/Sonarr.git
synced 2024-11-01 08:22:35 +01:00
f3809d3a80
Conflicts: NzbDrone.Common/packages.config NzbDrone.Core.Test/packages.config NzbDrone.Core/NzbDrone.Core.csproj NzbDrone.Core/packages.config NzbDrone.Services/NzbDrone.Services.Service/packages.config NzbDrone.Web.UI.Test/NzbDrone.Web.UI.Automation.csproj NzbDrone.Web/_bin_deployableAssemblies/amd64/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest NzbDrone.Web/_bin_deployableAssemblies/amd64/Microsoft.VC90.CRT/README_ENU.txt NzbDrone.Web/_bin_deployableAssemblies/amd64/Microsoft.VC90.CRT/msvcr90.dll NzbDrone.Web/_bin_deployableAssemblies/amd64/sqlceme40.dll NzbDrone.Web/_bin_deployableAssemblies/x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest NzbDrone.Web/_bin_deployableAssemblies/x86/Microsoft.VC90.CRT/README_ENU.txt NzbDrone.Web/_bin_deployableAssemblies/x86/Microsoft.VC90.CRT/msvcr90.dll NzbDrone.Web/_bin_deployableAssemblies/x86/sqlceme40.dll NzbDrone.Web/packages.config |
||
---|---|---|
.. | ||
Microsoft.VC90.CRT.manifest | ||
msvcr90.dll | ||
README_ENU.txt |