Laurent Destailleur b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php

2014-05-18 11:52:52 +02:00

..

doliwamp

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

2014-05-18 11:52:52 +02:00