From: Petr Špaček <petr.spacek@nic.cz>
Date: Fri, 20 Apr 2018 11:11:26 +0000 (+0200)
Subject: Merge branch 'fromjson' into 'master'
X-Git-Tag: v2.3.0~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3cd8829bf144cc389e5f0c4ab3bee7165b437d05;p=thirdparty%2Fknot-resolver.git

Merge branch 'fromjson' into 'master'

export a JSON decode function to lua

See merge request knot/knot-resolver!560
---

3cd8829bf144cc389e5f0c4ab3bee7165b437d05