grossmj b3dfb87622 Merge branch '2.2' into 3.0 ...

# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.96be36058f5df0ca7e7f.js
#	gns3server/utils/images.py
#	gns3server/version.py
#	requirements.txt
#	tests/compute/docker/test_docker_vm.py
#	tests/controller/test_controller.py

2023-05-22 15:11:17 +08:00

..

test_docker_vm.py

Merge branch '2.2' into 3.0

2023-05-22 15:11:17 +08:00

test_docker.py

Upgrade dev dependencies and fix tests to support pytest-asyncio strict mode

2022-08-24 21:03:16 +02:00