wagnertech.de Git - kivitendo-erp.git/commit - SL/Helper/Csv.pm

projects / kivitendo-erp.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 82c4717 5c4833d)

author	Jan Büren <jan@kivitendo-premium.de>
	Thu, 30 May 2013 11:38:24 +0000 (13:38 +0200)
committer	Jan Büren <jan@kivitendo-premium.de>
	Thu, 30 May 2013 11:38:24 +0000 (13:38 +0200)
commit	82053b457be3de2ee5285dc13633222f4d30802c
tree	8e2c1f6295cd28840079df45fda7c52381f5afad	tree \| snapshot
parent	82c4717d48bbdb8d30c9671e71ecb0d6d8eac963	commit \| diff
parent	5c4833d72ee69bdbbc4aefe469caf2913801c96a	commit \| diff

Merge branch 'master' of github.com:kivitendo/kivitendo-erp

Conflicts:
SL/DB/MetaSetup/Default.pm
locale/de/all

SL/AM.pm	diff1 \|	diff2 \|	blob \| history
SL/DB/MetaSetup/Default.pm	diff1 \|	diff2 \|	blob \| history
SL/DO.pm	diff1 \|	diff2 \|	blob \| history
SL/IR.pm	diff1 \|	diff2 \|	blob \| history
SL/IS.pm	diff1 \|	diff2 \|	blob \| history
SL/InstanceConfiguration.pm	diff1 \|	diff2 \|	blob \| history
SL/OE.pm	diff1 \|	diff2 \|	blob \| history
bin/mozilla/ic.pl	diff1 \|	diff2 \|	blob \| history
locale/de/all	diff1 \|	diff2 \|	blob \| history

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