Merge branch '2.0' into 2.1

This commit is contained in:
Julien Duponchelle
2017-05-31 16:58:31 +02:00
19 changed files with 218 additions and 21 deletions

View File

@ -22,7 +22,6 @@ import tempfile
from gns3server.web.route import Route
from gns3server.controller import Controller
from gns3server.controller.project import Project
from gns3server.controller.import_project import import_project
from gns3server.controller.export_project import export_project
from gns3server.config import Config