grossmj 7487ec14e0

Merge branch '2.2' into 3.1 ...

# Conflicts:
#	CHANGELOG
#	conf/gns3_server.conf
#	gns3server/compute/docker/__init__.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/controller/import_project.py
#	gns3server/crash_report.py
#	gns3server/version.py

2026-07-21 17:03:00 +02:00

..

resources

QEMU config disk - add missing config disk to image directory

2020-07-19 17:56:49 +09:30

utils

Merge branch '2.2' into 3.0

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

__init__.py

Fix invalid escape sequences

2024-04-23 16:52:28 +07:00

qemu_error.py

Use pyupgrade with --py36-plus param.

2021-04-13 18:37:58 +09:30

qemu_vm.py

Merge branch '2.2' into 3.1

2026-07-21 17:03:00 +02:00