projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49be66c b1a26a6)
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 9 Jan 2014 11:47:36 +0000 (12:47 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 9 Jan 2014 11:47:36 +0000 (12:47 +0100)
1  2 
SL/Form.pm patch | diff1 | diff2 | blob | history
locale/de/all patch | diff1 | diff2 | blob | history

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