Merge branch '2.2' into 3.0

Browse Source

# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/handlers/api/compute/server_handler.py
#	gns3server/utils/path.py
#	gns3server/version.py
#	requirements.txt
#	tests/compute/qemu/test_qemu_vm.py
#	tests/compute/test_manager.py

...

This commit is contained in:

grossmj committed 2021-09-09 16:36:17 +09:30

2 parents fdc3774fff 6f1feed265

commit a324459152

571 files changed

+3964 -13577

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/compute/server_handler.py

Whitespace-only changes.