Commit ba7ccdab authored by echel0n's avatar echel0n
Browse files

Merge branch 'master' into develop

# Conflicts:
#	package.json
#	setup.cfg
#	sickrage/__init__.py
#	sickrage/version.txt
parents d4632034 807f96e3
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment