Merge branch '2.1' into 2.2

# Conflicts:
#	gns3server/schemas/node.py
This commit is contained in:
grossmj committed 2018-03-30 12:14:09 +07:00
commit 669d2ec038
18 files changed
+1952 -15

No files matched your search

+1
View File
@@ -417,6 +417,7 @@ class Link:
"""
for node in self._nodes:
if node["node"].node_type in ('vpcs',
'traceng',
'vmware',
'dynamips',
'qemu',