Private GIT

Skip to content
Snippets Groups Projects
Commit fddc3baa authored by Dustyn Gibson's avatar Dustyn Gibson
Browse files

Merge branch 'develop' of https://github.com/CristianBB/SickRage into CristianBB-develop

Fix conflict, Clean up newpct a bit, fix missed import, removed trailing whitespace
Conflicts:
	sickbeard/__init__.py
parents 80fa3099 31c1e454
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment