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

projects / kivitendo-erp.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4088f2a 809d648)

author	Niclas Zimmermann <niclas@kivitendo-premium.de>
	Thu, 2 May 2013 08:55:07 +0000 (10:55 +0200)
committer	Niclas Zimmermann <niclas@kivitendo-premium.de>
	Thu, 2 May 2013 08:55:07 +0000 (10:55 +0200)
commit	a23454bb1b039a31b7f77710ff663fa9152d530c
tree	96c56072954e03c37d779c00be5e9ef50d74f19d	tree \| snapshot
parent	4088f2a903ccaa0c29d1a981f53ece6e432400e8	commit \| diff
parent	809d6481a49413a414583e6db556ee1bb89df363	commit \| diff

Merge branch 'master' into currency

Conflicts:
locale/de/all

SL/AM.pm	diff1 \|	diff2 \|	blob \| history
SL/DO.pm	diff1 \|	diff2 \|	blob \| history
SL/Form.pm	diff1 \|	diff2 \|	blob \| history
SL/IR.pm	diff1 \|	diff2 \|	blob \| history
SL/IS.pm	diff1 \|	diff2 \|	blob \| history
SL/OE.pm	diff1 \|	diff2 \|	blob \| history
bin/mozilla/ic.pl	diff1 \|	diff2 \|	blob \| history
bin/mozilla/ir.pl	diff1 \|	diff2 \|	blob \| history
locale/de/all	diff1 \|	diff2 \|	blob \| history
templates/webpages/am/edit_defaults.html	diff1 \|	diff2 \|	blob \| history

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