grossmj e9827653ae

Merge branch '2.2' into 3.0 ...

# Conflicts:
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/version.py
#	tests/compute/docker/test_docker_vm.py

2024-03-05 01:05:46 +08:00

..

web-ui

Merge branch '2.2' into 3.0

2024-03-05 01:05:46 +08:00

.gitkeep

Support /static/ files serving, Ref: #1362

2018-06-22 15:29:47 +02:00