grossmj 09774a3a56

Merge branch '2.2' into 3.0 ...

# Conflicts:
#	CHANGELOG
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/controller/compute.py
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.c83939cdfe3af0ec27df.js
#	gns3server/version.py
#	gns3server/web/web_server.py
#	requirements.txt
#	tests/controller/test_compute.py

2025-01-22 18:37:17 +10:00

..

__init__.py

Merge branch '2.2' into 3.0

2023-09-23 15:54:54 +10:00

virtualbox_error.py

Use pyupgrade with --py36-plus param.

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

virtualbox_vm.py

Merge branch '2.2' into 3.0

2025-01-22 18:37:17 +10:00