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
FullShow.cs	Seasons are now subdocuments of series	2013-09-09 23:44:00 -07:00
Images.cs
Season.cs
TraktException.cs	Moved NzbDroneClientException to Core	2013-09-09 08:09:55 -07:00