Keivan Beigi 50b2aba5f9 Merge branch 'develop' ...

Conflicts:
	NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs
	NzbDrone.Core/Jobs/TaskManager.cs
	NzbDrone.Core/MetadataSource/TraktProxy.cs
	NzbDrone.Core/Tv/SeasonService.cs
	NzbDrone.Integration.Test/SeasonIntegrationTests.cs

2013-09-16 10:24:10 -07:00

..

Episode.cs

cleaning up episode/series air date/time

2013-05-12 18:32:21 -07:00

FullShow.cs

Seasons are now subdocuments of series

2013-09-09 23:44:00 -07:00

Images.cs

fully replaced TVDB with Trakt.tv

2013-03-31 13:25:39 -07:00

Season.cs

fully replaced TVDB with Trakt.tv

2013-03-31 13:25:39 -07:00

TraktException.cs

Moved NzbDroneClientException to Core

2013-09-09 08:09:55 -07:00