Laurent Destailleur 6d7b340cee Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/class/dolgraph.class.php
	htdocs/langs/en_AU/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/other.lang

2015-03-16 18:30:30 +01:00

..

commande.class.php

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

2015-03-16 18:30:30 +01:00

commandestats.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00