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

Conflicts:
	htdocs/fourn/commande/fiche.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang

2013-12-19 21:03:15 +01:00

..

commande.class.php

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

2013-12-19 21:03:15 +01:00

commandestats.class.php

Fix: Fix graph for product distribution.

2013-08-27 11:54:07 +02:00