-
- Downloads
Fixed master merge conflicts
Showing
- SickBeard.py 5 additions, 0 deletionsSickBeard.py
- cherrypy/favicon.ico 0 additions, 0 deletionscherrypy/favicon.ico
- data/css/config.css 2 additions, 0 deletionsdata/css/config.css
- data/css/default.css 4 additions, 1 deletiondata/css/default.css
- data/interfaces/default/comingEpisodes.tmpl 5 additions, 6 deletionsdata/interfaces/default/comingEpisodes.tmpl
- data/interfaces/default/config_episodedownloads.tmpl 1 addition, 1 deletiondata/interfaces/default/config_episodedownloads.tmpl
- data/interfaces/default/config_notifications.tmpl 31 additions, 29 deletionsdata/interfaces/default/config_notifications.tmpl
- data/interfaces/default/displayShow.tmpl 1 addition, 1 deletiondata/interfaces/default/displayShow.tmpl
- data/interfaces/default/home.tmpl 8 additions, 4 deletionsdata/interfaces/default/home.tmpl
- data/interfaces/default/home_addRootDir.tmpl 1 addition, 1 deletiondata/interfaces/default/home_addRootDir.tmpl
- data/interfaces/default/inc_bottom.tmpl 2 additions, 2 deletionsdata/interfaces/default/inc_bottom.tmpl
- data/interfaces/default/inc_top.tmpl 4 additions, 4 deletionsdata/interfaces/default/inc_top.tmpl
- sickbeard/databases/mainDB.py 11 additions, 1 deletionsickbeard/databases/mainDB.py
- sickbeard/name_parser/regexes.py 2 additions, 2 deletionssickbeard/name_parser/regexes.py
- sickbeard/notifiers/growl.py 13 additions, 7 deletionssickbeard/notifiers/growl.py
- sickbeard/notifiers/xbmc.py 2 additions, 2 deletionssickbeard/notifiers/xbmc.py
- sickbeard/providers/ezrss.py 25 additions, 10 deletionssickbeard/providers/ezrss.py
- sickbeard/providers/generic.py 1 addition, 4 deletionssickbeard/providers/generic.py
- sickbeard/sceneHelpers.py 2 additions, 0 deletionssickbeard/sceneHelpers.py
- sickbeard/show_queue.py 1 addition, 1 deletionsickbeard/show_queue.py
Loading
Please register or sign in to comment