From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Fri, 7 Dec 2018 13:57:55 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: 1.6.4^2~102
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=010da891538ef6144b9e5a533594b59cde9aa996;p=pixelpark%2Fpuppetmaster-webhooks.git

Merge branch 'master' into develop

Conflicts:
	lib/webhooks/__init__.py
---

010da891538ef6144b9e5a533594b59cde9aa996