mirror of https://github.com/Sonarr/Sonarr
5bbe310af5
Conflicts: NzbDrone.Common/DiskProvider.cs NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs NzbDrone.Core/Providers/DiskScanProvider.cs NzbDrone.Core/Providers/DownloadProvider.cs |
||
---|---|---|
.. | ||
Migrations | ||
PetaPoco | ||
Relators | ||
Connection.cs | ||
CustomeMapper.cs | ||
DbProviderFactory.cs | ||
MigrationLogger.cs | ||
MigrationsHelper.cs |