Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-05-18 11:25:41 +02:00
commit d5895c3a47
22 files changed
+65 -53

No files matched your search

+1 -1
View File
@@ -424,7 +424,7 @@ class BaseManager:
return force_unix_path(path)
else:
# For non local server we disallow using absolute path outside image directory
# For non local server we disallow using absolute path outside image directory
if Config.instance().get_section_config("Server").get("local", False) is False:
img_directory = self.config.get_section_config("Server").get("images_path", os.path.expanduser("~/GNS3/images"))
img_directory = force_unix_path(img_directory)