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

Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php

2020-09-12 04:42:59 +02:00

..

action

Close #14604 Merge manually change to get notification to show

2020-09-12 03:02:08 +02:00

admin

Scrutinizer Auto-Fixes

2020-04-10 08:59:32 +00:00

mailing

The deprecated subsitution key __SIGNATURE__ has been removed. Replace

2020-09-06 19:25:25 +02:00

propal

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

2020-09-12 04:42:59 +02:00

prospect

Merge branch 'develop' into stcommcontact

2020-07-31 16:41:17 +02:00

card.php

css

2020-08-29 01:11:08 +02:00

contact.php

add new rule

2020-05-21 15:05:19 +02:00

index.php

Fixing style errors.

2020-09-10 09:07:10 +00:00

multiprix.php

add new rule

2020-05-21 15:05:19 +02:00

recap-client.php

add new rule

2020-05-21 15:05:19 +02:00

remise.php

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

2020-07-08 18:11:58 +02:00

remx.php

add new rule

2020-05-21 15:05:19 +02:00