projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8041f98 9c563fc)
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 23 Nov 2015 17:43:45 +0000 (18:43 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 23 Nov 2015 17:43:45 +0000 (18:43 +0100)
1  2 
doc/dokumentation.xml patch | diff1 | diff2 | blob | history

diff --cc doc/dokumentation.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.