Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle
2016-05-16 16:48:53 +02:00

View File

@ -20,3 +20,4 @@ from gns3server.handlers.index_handler import IndexHandler
from gns3server.handlers.api.controller import * from gns3server.handlers.api.controller import *
from gns3server.handlers.api.compute import * from gns3server.handlers.api.compute import *