Private GIT

Skip to content
Snippets Groups Projects
Commit 36c78319 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/v3.0.0' 

Conflicts:
	gui/slick/interfaces/default/config.tmpl
	sickbeard/__init__.py
	sickbeard/versionChecker.py
parents 6270f251 be0e3ab8
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 15718 additions and 9377 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)