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

9b5c30fc

Commit 9b5c30fc authored 9 years ago by Dustyn Gibson

Downloads
- Plain Diff

Merge branch 'develop'

Conflicts:
	sickbeard/providers/newznab.py

parents 732fb5b3 82233ee9

Branches

Tags

Loading

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

gui/slick/images/providers/anonzbs.png 0 additions, 0 deletions

gui/slick/images/providers/anonzbs.png
gui/slick/images/providers/anonzbs_com.png 0 additions, 0 deletions

gui/slick/images/providers/anonzbs_com.png
sickbeard/helpers.py 3 additions, 1 deletion

sickbeard/helpers.py
sickbeard/metadata/generic.py 10 additions, 10 deletions

sickbeard/metadata/generic.py
sickbeard/notifiers/plex.py 1 addition, 1 deletion

sickbeard/notifiers/plex.py
sickbeard/providers/newznab.py 3 additions, 3 deletions

sickbeard/providers/newznab.py

with 17 additions and 15 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)