grossmj 88674455a3 Merge branch '2.1' into 2.2 ... # Conflicts: # gns3server/version.py # tests/compute/docker/test_docker_vm.py		2018-03-14 18:40:37 +07:00
..
test_docker_vm.py	Handle docker env with last empty line, Fixes: #2420	2018-02-27 16:33:55 +01:00
test_docker.py	Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269	2018-01-24 11:11:53 +01:00