projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1775ca 817f730)
Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorHolger Lindemann <hli@lx-system.de>
Wed, 27 Oct 2010 05:30:12 +0000 (07:30 +0200)
committerHolger Lindemann <hli@lx-system.de>
Wed, 27 Oct 2010 05:30:12 +0000 (07:30 +0200)
1  2 
menu.ini patch | diff1 | diff2 | blob | history

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