Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
fredfortier
2017-10-23 20:29:57 -04:00
+1 -1
View File
@@ -126,7 +126,7 @@ def catalyst_root(environ=None):
root = environ.get('ZIPLINE_ROOT', None)
if root is None:
root = expanduser('~/.catalyst')
root = os.path.join(expanduser('~'),'.catalyst')
return root