Merge from hell? Something from the past came back to haunt us

2026-04-18 21:34:28 -04:00 · 2013-05-03 00:20:52 -07:00
parent 7ab1084437
commit 17e99958e1
6 changed files with 2 additions and 15 deletions
--- a/UI/Routing.js
+++ b/UI/Routing.js
@@ -11,8 +11,6 @@ require(['app', 'Controller'], function (app, controller) {
            'series/add'                 : 'addSeries',
            'series/add/:action(/:query)': 'addSeries',
            'series/details/:query'      : 'seriesDetails',
-            'upcoming'                   : 'upcoming',
-            'upcoming/index'             : 'upcoming',
            'calendar'                   : 'calendar',
            'settings'                   : 'settings',
            'settings/:action(/:query)'  : 'settings',