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

Merge branch 'refs/heads/develop'

Browse Source 
Conflicts:
	version.py
This commit is contained in:
Ruud
2012-09-16 10:46:39 +02:00
parent f9c2503f81 43e1adbff9
commit c0fb28301d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/browser/main.py
+1 -1
View File
@@ -55,7 +55,7 @@ class FileBrowser(Plugin):
driveletters = [] driveletters = []
for drive in string.ascii_uppercase: for drive in string.ascii_uppercase:
if win32file.GetDriveType(drive + ":") in [win32file.DRIVE_FIXED, win32file.DRIVE_REMOTE]: if win32file.GetDriveType(drive + ":") in [win32file.DRIVE_FIXED, win32file.DRIVE_REMOTE, win32file.DRIVE_RAMDISK, win32file.DRIVE_REMOVABLE]:
driveletters.append(drive + ":\\") driveletters.append(drive + ":\\")
return driveletters return driveletters
couchpotato/core/providers/torrent/publichd/main.py
+1 -1
View File
@@ -24,7 +24,7 @@ class PublicHD(TorrentProvider):
results = [] results = []
if self.isDisabled() or quality['hd'] != True: if self.isDisabled() or not quality.get('hd', False):
return results return results
params = tryUrlencode({ params = tryUrlencode({
version.py
+1 -1
View File
@@ -1,2 +1,2 @@
VERSION = '2.0.0.pre1' VERSION = '2.0.0.pre2'
BRANCH = 'master' BRANCH = 'master'