dolibarr/build/exe
Laurent Destailleur 11d4a945b0 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/adherents/liste.php
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/contact/list.php
	htdocs/contrat/liste.php
	htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
..
doliwamp Merge remote-tracking branch 'origin/3.6' into 3.7 2015-05-25 18:08:23 +02:00