]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
projects / profitbricks / jenkins-build-scripts.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9ff504 9c92663)
Merge branch 'develop'
authorHolger Levsen <holger@layer-acht.org>
Thu, 22 Aug 2013 16:11:38 +0000 (18:11 +0200)
committerHolger Levsen <holger@layer-acht.org>
Thu, 22 Aug 2013 16:11:38 +0000 (18:11 +0200)
Conflicts resolved:
debian_build.py


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