Merge branch 'master' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-07-28 15:05:21 +02:00
commit 0c3a2c660a
3 files changed
+7 -3

No files matched your search

+3 -1
View File
@@ -17,12 +17,14 @@
import sys
import json
import jsonschema
import urllib
import asyncio
import aiohttp
import logging
import urllib
import traceback
import jsonschema
log = logging.getLogger(__name__)