grossmj 13630179b2 Merge branch '2.2' into 3.0 ... # Conflicts: # appveyor.yml # gns3server/compute/project_manager.py # gns3server/handlers/api/controller/node_handler.py # gns3server/static/web-ui/index.html # gns3server/static/web-ui/main.febf2f1259a67875a3e3.js		2023-11-03 14:56:55 +10:00
..
gns3_server.conf	Merge branch '2.2' into 3.0	2023-11-03 14:56:55 +10:00