Laurent Destailleur 29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php

2013-01-13 19:33:54 +01:00

..

doc_generic_proposal_odt.modules.php

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-13 19:33:54 +01:00

pdf_azur.modules.php

Fix: An easier to understand fix. Remove also not recommanded "continue

2013-01-08 22:59:36 +01:00