]> Frank Brehm's Git Trees - pixelpark/puppetmaster-webhooks.git/commitdiff
Merge branch 'master' into develop
authorFrank Brehm <frank.brehm@pixelpark.com>
Fri, 20 Oct 2017 13:41:45 +0000 (15:41 +0200)
committerFrank Brehm <frank.brehm@pixelpark.com>
Fri, 20 Oct 2017 13:41:45 +0000 (15:41 +0200)
Conflicts:
lib/webhooks/__init__.py

1  2 
lib/webhooks/base_app.py
lib/webhooks/deploy.py

Simple merge
Simple merge