projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2647d69 1814001)
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 2 Jul 2015 16:03:48 +0000 (18:03 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 2 Jul 2015 16:03:48 +0000 (18:03 +0200)
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.