Marcos García de La Fuente efb9f7f4fd Merge branch 'develop' into refactor-1 ...

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/includes/tcpdi/fpdf_tpl.php

2015-03-15 18:07:30 +01:00

..

commande.class.php

Merge branch 'develop' into refactor-1

2015-03-15 18:07: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