Laurent Destailleur 9b7982bf0c Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/card.php
	htdocs/theme/eldy/style.css.php

2015-06-08 18:28:50 +02:00

..

dolibarr_screenshot2.png

…

dolibarr_screenshot6.png

…

dolibarr_screenshot8.png

…

dolibarr_screenshot9.png

…

index.php

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

2015-06-08 18:28:50 +02:00