Private GIT

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

SickRage-1
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

37914618

Commit 37914618 authored 9 years ago by Dustyn Gibson

Downloads
- Plain Diff

Merge branch 'develop'

parents bb16d3a3 64d6c2f6

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Show whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 1 deletion

.gitignore
gui/slick/views/home.mako 17 additions, 18 deletions

gui/slick/views/home.mako
gui/slick/views/layouts/main.mako 1 addition, 1 deletion

gui/slick/views/layouts/main.mako
lib/BeautifulSoup.py 2017 additions, 0 deletions

lib/BeautifulSoup.py
sickbeard/clients/deluged_client.py 4 additions, 4 deletions

sickbeard/clients/deluged_client.py
sickbeard/metadata/generic.py 11 additions, 11 deletions

sickbeard/metadata/generic.py
sickbeard/providers/hdtorrents.py 31 additions, 27 deletions

sickbeard/providers/hdtorrents.py
sickbeard/webserve.py 15 additions, 12 deletions

sickbeard/webserve.py
sickrage/media/GenericMedia.py 16 additions, 3 deletions

sickrage/media/GenericMedia.py
sickrage/media/ShowNetworkLogo.py 4 additions, 2 deletions

sickrage/media/ShowNetworkLogo.py
sickrage/show/History.py 29 additions, 18 deletions

sickrage/show/History.py

with 2146 additions and 97 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Another place to be (or not)