grossmj 033f005bde Merge branch '2.1' into 2.2 ...

# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py

2018-08-07 21:06:42 +07:00

..

compute

Merge branch '2.1' into 2.2

2018-08-07 21:06:42 +07:00

controller

Merge branch '2.1' into 2.2

2018-08-07 21:06:42 +07:00

__init__.py

Display an upload form (upload is not yet ready)

2015-02-23 11:28:33 +01:00

base.py

Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269

2018-01-24 11:11:53 +01:00