ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-16 06:18:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source 
# Conflicts:
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
This commit is contained in:
grossmj
2018-04-18 17:08:42 +08:00
parent ee5317948b 9ecb058343
commit 2ea0aa5ded
29 changed files with 291 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gns3server/controller/topology.py
View File

@ -83,6 +83,7 @@ def project_to_topology(project):
"show_layers": project.show_layers,
"snap_to_grid": project.snap_to_grid,
"show_grid": project.show_grid,
"grid_size": project.grid_size,
"show_interface_labels": project.show_interface_labels,
"topology": {
"nodes": [],