Laurent Destailleur 67820774bb Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php

2013-07-27 14:21:47 +02:00

..

index.php

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

2013-07-27 14:21:47 +02:00