]> Frank Brehm's Git Trees - pixelpark/puppetmaster-webhooks.git/commitdiff
projects / pixelpark / puppetmaster-webhooks.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e49227 8acc4ac)
Merge branch 'master' into develop
authorFrank Brehm <frank.brehm@pixelpark.com>
Fri, 7 Dec 2018 13:57:55 +0000 (14:57 +0100)
committerFrank Brehm <frank.brehm@pixelpark.com>
Fri, 7 Dec 2018 13:57:55 +0000 (14:57 +0100)
Conflicts:
lib/webhooks/__init__.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.