projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c931a2 489ac6d)
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 8 Nov 2012 11:41:59 +0000 (12:41 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 8 Nov 2012 11:41:59 +0000 (12:41 +0100)
1  2 
SL/DBUpgrade2.pm patch | diff1 | diff2 | blob | history
locale/de/all patch | diff1 | diff2 | blob | history

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