projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7bff84c 3e52fa9)
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorThomas Heck <theck@linet-services.de>
Thu, 6 Sep 2012 12:22:14 +0000 (14:22 +0200)
committerThomas Heck <theck@linet-services.de>
Thu, 6 Sep 2012 12:22:14 +0000 (14:22 +0200)
1  2 
SL/Template/Plugin/L.pm patch | diff1 | diff2 | blob | history
locale/de/all patch | diff1 | diff2 | blob | history

diff --cc SL/Template/Plugin/L.pm
Simple merge
diff --cc locale/de/all
Simple merge
Unnamed repository; edit this file 'description' to name the repository.