projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29379d9 69c1212)
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 15 Jul 2013 16:49:53 +0000 (18:49 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 15 Jul 2013 16:49:53 +0000 (18:49 +0200)
Conflicts:
SL/Template/Plugin/JavaScript.pm


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.