You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

grossmj fe90d2b146 Merge branch '2.2' into 3.0 ... # Conflicts: # gns3server/controller/__init__.py # gns3server/controller/appliance_manager.py # gns3server/crash_report.py # gns3server/run.py # gns3server/static/web-ui/index.html # gns3server/utils/images.py # gns3server/version.py # requirements.txt # scripts/update-bundled-web-ui.sh		1 year ago
..
web-ui	Merge branch '2.2' into 3.0	1 year ago
.gitkeep	Support /static/ files serving, Ref: #1362	6 years ago