projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b404450 347fcb5)
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 8 Nov 2012 15:15:08 +0000 (16:15 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 8 Nov 2012 15:15:08 +0000 (16:15 +0100)
1  2 
SL/RP.pm patch | diff1 | diff2 | blob | history
locale/de/all patch | diff1 | diff2 | blob | history
templates/webpages/rp/report.html patch | diff1 | diff2 | blob | history

diff --cc SL/RP.pm
Simple merge
diff --cc locale/de/all
Simple merge
diff --cc templates/webpages/rp/report.html
Simple merge
Unnamed repository; edit this file 'description' to name the repository.