projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6bb3a61
c322b02
)
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
author
Niclas Zimmermann
<niclas@kivitendo-premium.de>
Thu, 18 Apr 2013 11:55:35 +0000
(13:55 +0200)
committer
Niclas Zimmermann
<niclas@kivitendo-premium.de>
Thu, 18 Apr 2013 11:55:35 +0000
(13:55 +0200)
Behebt einfach nur Conflicts.
Conflicts:
SL/TransNumber.pm
Trivial merge
projects / kivitendo-erp.git / commitdiff