Ruud 2a2fe448e7 Merge branch 'refs/heads/develop' into tv ...

Conflicts:
	couchpotato/core/media/movie/_base/main.py
	couchpotato/core/providers/torrent/bitsoup/main.py
	couchpotato/core/providers/torrent/iptorrents/main.py
	couchpotato/core/providers/torrent/sceneaccess/main.py
	couchpotato/core/providers/torrent/torrentleech/main.py
	couchpotato/core/providers/torrent/torrentshack/main.py

2014-01-11 13:55:12 +01:00

..

binsearch

Merge branch 'refs/heads/develop' into tv

2014-01-11 13:55:12 +01:00

newznab

Merge branch 'refs/heads/develop' into tv

2014-01-11 13:55:12 +01:00

nzbclub

Renamed 'library.title' to 'library.query'

2014-01-11 16:23:33 +13:00

nzbindex

Renamed 'library.title' to 'library.query'

2014-01-11 16:23:33 +13:00

omgwtfnzbs

Add proper detail url for OMGWTF

2013-10-27 19:50:26 +01:00

__init__.py

Also try to load the root module for each path

2013-09-28 21:25:25 +02:00

base.py

Rename type to protocol

2013-08-18 11:47:54 +02:00