grossmj 33e8710495 Merge branch '2.1' into 2.2 ... # Conflicts: # gns3server/compute/docker/docker_vm.py # gns3server/controller/compute.py # gns3server/controller/gns3vm/__init__.py # gns3server/controller/link.py # gns3server/controller/project.py # gns3server/handlers/api/controller/project_handler.py # gns3server/handlers/api/controller/server_handler.py # gns3server/utils/asyncio/__init__.py # gns3server/utils/asyncio/telnet_server.py # gns3server/version.py # gns3server/web/web_server.py # tests/compute/qemu/test_qemu_vm.py		2018-08-29 15:57:54 +07:00
..
asyncio	Fake console for simple Ethernet switch	2017-05-31 15:13:29 +02:00
test_asyncio.py	Refactor asyncio locking system for Python 3.7 support. Ref https://github.com/GNS3/gns3-gui/issues/2566 Ref https://github.com/GNS3/gns3-gui/issues/2568	2018-08-25 14:10:47 +07:00
test_file_watcher.py
test_images.py	Cancellable md5sum calculation on thread, Ref. gui#2239	2018-01-29 10:18:13 +01:00
test_interfaces.py
test_path.py	Support /static/ files serving, Ref: #1362	2018-06-22 15:29:47 +02:00
test_picture.py
test_static.py	Fix tests on Windows	2018-06-28 09:16:51 +02:00