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

projects / kivitendo-erp.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9be2155 68610ba)

author	Niclas Zimmermann <niclas@kivitendo-premium.de>
	Mon, 3 Jun 2013 11:49:40 +0000 (13:49 +0200)
committer	Niclas Zimmermann <niclas@kivitendo-premium.de>
	Mon, 3 Jun 2013 11:49:40 +0000 (13:49 +0200)
commit	c6b2257945060625bcb86fa7e2efd27c737480ff
tree	3f4a60576138d1a6bf625d47da78a6cdeececef3	tree \| snapshot
parent	9be2155c4e7ee8ea2c000b8fb20110d5e9bd97cc	commit \| diff
parent	68610badb49a0bcb03acea594a236e1812cdb869	commit \| diff

Merge branch 'gewicht'

Conflicts:
SL/Controller/ClientConfig.pm
SL/DB/MetaSetup/Default.pm

SL/Controller/ClientConfig.pm	diff1 \|	diff2 \|	blob \| history
SL/DB/Helper/FlattenToForm.pm	diff1 \|	diff2 \|	blob \| history
SL/DB/MetaSetup/Default.pm	diff1 \|	diff2 \|	blob \| history
SL/DO.pm	diff1 \|	diff2 \|	blob \| history
SL/IS.pm	diff1 \|	diff2 \|	blob \| history
SL/OE.pm	diff1 \|	diff2 \|	blob \| history
locale/de/all	diff1 \|	diff2 \|	blob \| history
templates/webpages/client_config/form.html	diff1 \|	diff2 \|	blob \| history

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