open-source-mirrors
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
pull/23/head
Mark McDowall 12 years ago
parent 50f6ec4fc6
commit 3430ad3ee8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
NzbDrone.Backbone/Controller.js
Unescape View File

@ -2,7 +2,7 @@
'Series/Index/SeriesIndexCollectionView', 'Upcoming/UpcomingCollectionView', 'Series/Index/SeriesIndexCollectionView', 'Upcoming/UpcomingCollectionView',
'Calendar/CalendarCollectionView', 'Shared/NotificationView', 'Calendar/CalendarCollectionView', 'Shared/NotificationView',
'Shared/NotFoundView', 'MainMenuView', 'HeaderView', 'Shared/NotFoundView', 'MainMenuView', 'HeaderView',
'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection'], 'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection',
'Settings/SettingsLayout'], 'Settings/SettingsLayout'],
function (app, modalRegion) { function (app, modalRegion) {

Write Preview
Loading…
Cancel
Save