shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-29 21:39:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xem' into 'master'

Browse Source 
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
This commit is contained in:
Mark McDowall
2012-10-20 16:07:04 -07:00
parent 96a14bab9a d99415bc31
commit 5bbe310af5
61 changed files with 1085 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NzbDrone.Core/Model/EpisodeParseResult.cs
View File

@@ -46,6 +46,10 @@ namespace NzbDrone.Core.Model
public string ReleaseGroup { get; set; }
public bool SceneSource { get; set; }
public IList<Episode> Episodes { get; set; }
public override string ToString()
{