Julien Duponchelle f8f6f5dc5d Merge branch 'master' into unstable ... Conflicts: gns3server/modules/virtualbox/__init__.py gns3server/version.py		2015-04-29 14:25:44 +02:00
..
handlers	Merge branch 'master' into unstable	2015-04-28 10:46:59 +02:00
modules	Merge branch 'master' into unstable	2015-04-29 14:25:44 +02:00
utils	Final fixes for windows test suite	2015-04-27 23:28:12 +02:00
web	Fix doc generation	2015-02-24 11:39:17 +01:00
__init__.py	Rename vpcs_id to id. Must be an integer in the route definition.	2015-01-18 12:12:11 -07:00
conftest.py	Make sure used ports in a project are cleaned up when closing it.	2015-03-21 17:19:12 -06:00
test_asyncio.py	All current iou code is async	2015-02-16 17:20:07 +01:00
test_config.py	Refactor config management in tests	2015-03-16 15:03:41 +01:00
test_run.py	Merge branch 'master' into unstable	2015-04-28 10:46:59 +02:00
utils.py	Fix server close tests	2015-02-06 11:31:54 +01:00