Private GIT

Skip to content
Snippets Groups Projects
Commit dfb9aa31 authored by Nic Wolfe's avatar Nic Wolfe
Browse files

Merge branch 'development' of github.com:midgetspy/Sick-Beard into custom_naming 

Conflicts:
	sickbeard/__init__.py
	sickbeard/postProcessor.py
	sickbeard/tv.py
parents b1837b4b 1cd1e069
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 343 additions and 251 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Another place to be (or not)