tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-17 21:25:39 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
Conflicts:
	src/UI/app.js
This commit is contained in:
Mark McDowall
2013-10-16 08:40:45 -07:00
parent ed1be19563 acd2069d5a
commit 2ecacecbfd
194 changed files with 2452 additions and 1595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/NzbDrone.Core/MetadataSource/TraktProxy.cs
View File

@@ -119,7 +119,6 @@ namespace NzbDrone.Core.MetadataSource
episode.SeasonNumber = traktEpisode.season;
episode.EpisodeNumber = traktEpisode.episode;
episode.EpisodeNumber = traktEpisode.number;
episode.TvDbEpisodeId = traktEpisode.tvdb_id;
episode.Title = traktEpisode.title;
episode.AirDate = FromIsoToString(traktEpisode.first_aired_iso);
episode.AirDateUtc = FromIso(traktEpisode.first_aired_iso);