Laurent Destailleur 756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php

2021-06-11 19:05:05 +02:00

..

admin

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

2021-06-11 19:05:05 +02:00

img

Remove one thousand of useless files

2021-04-12 15:57:16 +02:00

lib

Remove one thousand of useless files

2021-04-12 15:57:16 +02:00