4 Commits

Author	SHA1	Message	Date
Florian HENRY	72c92557de	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/product/class/propalmergepdfproduct.class.php	2015-04-19 13:06:59 +02:00
Florian HENRY	37bc7c3f1d	typo	2015-04-19 13:05:40 +02:00
Laurent Destailleur	a091a24657	Fix phpcs	2015-04-19 01:52:15 +02:00
Florian HENRY	e15d4c045d	NEW : Propal merge product card PDF into azur	2015-04-18 18:44:05 +02:00