Laurent Destailleur 361f13154b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/card.php
	htdocs/margin/tabs/thirdpartyMargins.php
	htdocs/societe/card.php
	htdocs/societe/note.php
	htdocs/societe/notify/card.php
	htdocs/societe/societecontact.php
	htdocs/ticket/list.php

2020-12-20 14:31:54 +01:00

..

index.html

…

productMargins.php

Scrutinizer Auto-Fixes

2020-10-31 13:32:18 +00:00

thirdpartyMargins.php

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

2020-12-20 14:31:54 +01:00