ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-17 06:48:18 +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

3
tests/controller/test_project.py
View File

@ -75,7 +75,8 @@ def test_json(tmpdir):
"show_grid": False,
"show_interface_labels": False,
"show_layers": False,
"snap_to_grid": False
"snap_to_grid": False,
"grid_size": 0,
}