]> 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: 2666680 86d163d)
Merge branch 'feature/DEVINF-358' into develop
authorMathias Klette <mathias.klette@profitbricks.com>
Tue, 30 Apr 2013 15:22:46 +0000 (17:22 +0200)
committerMathias Klette <mathias.klette@profitbricks.com>
Tue, 30 Apr 2013 15:22:46 +0000 (17:22 +0200)
Conflicts:
debian_build.py

1  2 
debian_build.py patch | diff1 | diff2 | blob | history

diff --cc debian_build.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.