Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle
2016-06-27 14:24:48 +02:00
5 changed files with 27 additions and 8 deletions

View File

@ -24,6 +24,7 @@ import asyncio
import logging
import aiohttp
import json
import sys
from gns3server.utils import parse_version
log = logging.getLogger(__name__)