projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5f3c1a e39733b)
Merge remote-tracking branch 'cebitversion/kivitendo_style'
authorSven Schöling <s.schoeling@linet-services.de>
Tue, 3 Apr 2012 09:53:03 +0000 (11:53 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Tue, 3 Apr 2012 09:53:03 +0000 (11:53 +0200)
Conflicts:
SL/Form.pm

1  2 
SL/Form.pm patch | diff1 | diff2 | blob | history

diff --cc SL/Form.pm
Simple merge
Unnamed repository; edit this file 'description' to name the repository.