Ruud 76807176fb Merge branch 'develop-categories' of git://github.com/clinton-hall/CouchPotatoServer into clinton-hall-develop-categories ...

Conflicts:
	couchpotato/core/plugins/score/main.py

2013-07-15 20:47:29 +02:00

..

__init__.py

Seeding support

2013-06-26 19:49:04 +02:00

main.py

Merge branch 'develop-categories' of git://github.com/clinton-hall/CouchPotatoServer into clinton-hall-develop-categories

2013-07-15 20:47:29 +02:00