Merge branch '2.2' into 3.0

Browse Source

# Conflicts:
#	gns3server/compute/base_node.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/compute/qemu/utils/qcow2.py
#	gns3server/handlers/api/compute/qemu_handler.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/version.py

...

This commit is contained in:

grossmj committed 2021-08-10 15:38:49 +09:30

2 parents 6dd0f4d4d3 8c0899d086

commit c5c95979c2

47 files changed

+305 -174

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/handlers/api/controller/server_handler.py

Whitespace-only changes.