projects / kivitendo-erp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7635f64) | patch
Behebt Conflict
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 3 Jun 2013 12:21:52 +0000 (14:21 +0200)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 3 Jun 2013 12:21:52 +0000 (14:21 +0200)
commit09c5711c11471bed8b080cc3afc9c6ece4e4e6d9
treeb27a84443a6bf25882628774527fb21423cfd843tree | snapshot
parent7635f647ec7dcdef51684b21601ee0930ea2bc5bcommit | diff
Behebt Conflict

Ein Conflict wurde im letzten merge vergessen zu beheben.
SL/Controller/ClientConfig.pm diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.