Private GIT

Skip to content
Snippets Groups Projects
Commit d2879140 authored by Ruud's avatar Ruud
Browse files

Merge branch 'refs/heads/develop' into pip

Conflicts:
	CouchPotato.py
	couchpotato/core/_base/updater/main.py
	couchpotato/core/notifications/twitter/main.py
	couchpotato/core/plugins/manage/main.py
	couchpotato/core/plugins/scanner/main.py
parents 5d0be4f0 c161bdd7
No related branches found
No related tags found
Loading
Showing
with 372 additions and 97 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment