dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/develop' into tv

Browse Source 
Conflicts:
	couchpotato/core/loader.py
	couchpotato/core/providers/info/_modifier/__init__.py
	couchpotato/core/providers/info/_modifier/main.py
	couchpotato/core/providers/movie/_modifier/main.py
	couchpotato/core/providers/show/_modifier/main.py
This commit is contained in:
Ruud
2013-08-24 18:30:00 +02:00
parent 8d5b55a753 199e61ea14
commit eced476eaf
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/synchronousdeluge/__init__.py
+2 -2
View File
@@ -19,6 +19,6 @@ __title__ = "synchronous-deluge"
__version__ = "0.1"
__author__ = "Christian Dale"
from .synchronousdeluge.client import DelugeClient
from .synchronousdeluge.exceptions import DelugeRPCError
from synchronousdeluge.client import DelugeClient
from synchronousdeluge.exceptions import DelugeRPCError
libs/synchronousdeluge/client.py
+3 -3
View File
@@ -3,9 +3,9 @@ import os
from collections import defaultdict
from itertools import imap
from .synchronousdeluge.exceptions import DelugeRPCError
from .synchronousdeluge.protocol import DelugeRPCRequest, DelugeRPCResponse
from .synchronousdeluge.transfer import DelugeTransfer
from synchronousdeluge.exceptions import DelugeRPCError
from synchronousdeluge.protocol import DelugeRPCRequest, DelugeRPCResponse
from synchronousdeluge.transfer import DelugeTransfer
__all__ = ["DelugeClient"]