Laurent Destailleur 9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ...

Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php

2019-12-23 14:13:26 +01:00

..

admin

Fix $_SESSION['newtoken'] must be newToken()

2019-12-18 23:12:31 +01:00

lib

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

tabs

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

2019-12-23 14:13:26 +01:00

agentMargins.php

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

2019-12-23 14:13:26 +01:00

checkMargins.php

Scrutinizer Auto-Fixes

2019-11-13 18:35:02 +00:00

customerMargins.php

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

2019-12-23 14:13:26 +01:00

index.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

productMargins.php

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

2019-12-23 14:13:26 +01:00