1
0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-22 22:15:17 -04:00

Merge branch 'series-sorttitle' of https://github.com/Taloth/NzbDrone into develop

Conflicts:
	src/NzbDrone.Api/Series/SeriesResource.cs
	src/NzbDrone.Core/Tv/SeriesService.cs
This commit is contained in:
Mark McDowall
2014-07-02 07:42:04 -07:00
24 changed files with 301 additions and 154 deletions
+1
View File
@@ -163,6 +163,7 @@ namespace NzbDrone.Api.Series
resource.EpisodeCount = seriesStatistics.EpisodeCount;
resource.EpisodeFileCount = seriesStatistics.EpisodeFileCount;
resource.NextAiring = seriesStatistics.NextAiring;
resource.PreviousAiring = seriesStatistics.PreviousAiring;
}
private void PopulateAlternateTitles(List<SeriesResource> resources)