Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-04-08 17:40:27 +02:00
commit 9e8fcab65c
34 files changed
+895 -188

No files matched your search

+1
View File
@@ -19,6 +19,7 @@ import json
import jsonschema
import asyncio
import aiohttp.web
import asyncio
import logging
import sys
import jinja2