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

Hope this fixes the crappy merge...

Browse Source 
Conflicts:

	couchpotato/core/_base/_core/main.py
	couchpotato/core/_base/desktop/main.py
This commit is contained in:
Ruud committed 2012-01-14 12:12:54 +01:00
1 parent 9e06a6f075
commit 33602f227d
8 files changed
+83 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

couchpotato/environment.py
+1 -1
View File
@@ -14,7 +14,7 @@ class Env(object):
_args = None
_quiet = False
_deamonize = False
_version = 0.5
_desktop = None
''' Data paths and directories '''
_app_dir = ""