Merge branch '2.2' into 3.0

Browse Source

# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/crash_report.py
#	gns3server/schemas/qemu.py
#	gns3server/schemas/qemu_template.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.1379a5647e8bc6d3e401.js
#	gns3server/version.py
#	tests/compute/qemu/test_qemu_vm.py

...

This commit is contained in:

grossmj committed 2023-07-13 10:09:26 +10:00

2 parents 9357ac6035 a6ca7c4e36

commit 3f691b60c9

16 files changed

+212 -83

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/disks/OVMF_CODE.fd

BIN

Binary file not shown.

gns3server/disks/OVMF_VARS.fd

BIN

Binary file not shown.

gns3server/disks/empty8G.qcow2

Executable → Regular

File mode changed.