Laurent Destailleur 2b1f57f01e Merge remote-tracking branch 'origin/3.9' into develop ...

Conflicts:
	dev/initdata/savedemo.sh
	htdocs/filefunc.inc.php
	htdocs/user/card.php

2016-03-18 11:54:14 +01:00

..

api_product.class.php

Fix PHPCS

2015-05-06 00:55:42 +02:00

html.formproduct.class.php

Fix PHPCS

2016-02-24 17:05:34 +01: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

product.class.php

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

2016-03-18 11:54:14 +01:00

productbatch.class.php

[Qual] Cleanup of inherited class properties

2015-09-24 20:12:55 +02:00

productcustomerprice.class.php

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

2016-02-19 04:46:11 +01:00

propalmergepdfproduct.class.php

[Qual] Cleanup of inherited class properties

2015-09-24 20:12:55 +02:00

service.class.php

[Qual] Cleanup of inherited class properties

2015-09-24 20:12:55 +02:00