1
0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-24 22:35:49 -04:00

Merge remote-tracking branch 'refs/remotes/galli-leo/develop' into develop

# Conflicts:
#	src/NzbDrone.Api/Series/MovieResource.cs
This commit is contained in:
Tim Turner
2017-01-09 15:59:25 -05:00
33 changed files with 492 additions and 1157 deletions
@@ -17,6 +17,7 @@ namespace NzbDrone.Core.Parser.Model
public string ReleaseHash { get; set; }
public string Edition { get; set;}
public int Year { get; set; }
public string ImdbId { get; set; }
public ParsedMovieInfo()
{