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 802959f9ab Merge branch 'master' into 3.0 ... # Conflicts: # dev-requirements.txt # gns3server/controller/__init__.py # gns3server/controller/appliance_manager.py # gns3server/controller/compute.py # gns3server/controller/topology.py # gns3server/handlers/api/compute/ethernet_switch_handler.py # gns3server/handlers/api/controller/link_handler.py # gns3server/handlers/api/controller/symbol_handler.py # gns3server/version.py # requirements.txt # tests/controller/test_export_project.py # tests/handlers/api/compute/test_qemu.py # tests/web/test_response.py # win-requirements.txt		3 years ago
..
compute	Merge branch 'master' into 3.0	3 years ago
controller	Merge branch 'master' into 3.0	3 years ago