grossmj 669d2ec038 Merge branch '2.1' into 2.2 ...

# Conflicts:
#	gns3server/schemas/node.py

2018-03-30 12:14:09 +07:00

..

compute

Fix traceng tests.

2018-03-30 12:10:57 +07:00

controller

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

2018-01-24 11:11:53 +01: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