Marcos García de La Fuente 87f97ed545 Merge branch 'develop' into units ...

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php

2015-04-18 23:38:14 +02:00

..

doc

Merge branch 'develop' into units

2015-04-18 23:38:14 +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

mod_propale_marbre.php

Doxygen

2014-08-31 23:18:09 +02:00

mod_propale_saphir.php

Fix: Masks works with thirdparty type

2015-03-04 18:18:55 +01:00

modules_propale.php

Scrutinizer Auto-Fixes

2015-04-07 00:45:30 +00:00