Files
dolibarr/scripts
Laurent Destailleur e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
..
2013-03-31 04:12:20 +02:00
2015-01-18 14:57:25 +01:00