grossmj 60c10e7ecc

Merge remote-tracking branch 'origin/2.2' into 3.0 ...

# Conflicts:
#	.github/workflows/testing.yml
#	CHANGELOG
#	README.md
#	gns3server/appliances/infix.gns3a
#	gns3server/compute/docker/__init__.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/crash_report.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	setup.py
#	tests/controller/test_project.py

2025-11-29 11:42:02 +10:00

..

resources

Fix errors in init.sh. Fixes #2431

2024-10-22 12:18:28 +10:00

__init__.py

Merge remote-tracking branch 'origin/2.2' into 3.0

2025-11-29 11:42:02 +10:00

docker_error.py

Use pyupgrade with --py36-plus param.

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

docker_vm.py

Merge remote-tracking branch 'origin/2.2' into 3.0

2025-11-29 11:42:02 +10:00