projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51323d9 55036af)
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 12 Oct 2012 15:35:16 +0000 (17:35 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 12 Oct 2012 15:35:16 +0000 (17:35 +0200)
1  2 
config/kivitendo.conf.default patch | diff1 | diff2 | blob | history

diff --cc config/kivitendo.conf.default
Simple merge
Unnamed repository; edit this file 'description' to name the repository.