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
..
2021-06-11 19:05:05 +02:00
2021-04-19 21:30:25 +02:00
2021-04-12 15:57:16 +02:00
2021-06-09 15:36:47 +02:00
2021-06-09 15:36:47 +02:00
2021-04-13 20:19:05 +02:00
2021-04-19 17:58:14 +02:00
2021-04-19 16:07:19 +00:00
2021-06-08 20:18:31 +02:00
2021-04-20 11:22:12 +02:00
2021-03-22 12:47:23 +01:00
2021-03-22 11:30:18 +01:00
2021-06-09 15:36:47 +02:00
2021-03-22 12:47:23 +01:00
2021-06-09 15:36:47 +02:00
2021-03-22 12:47:23 +01:00
2021-03-24 19:53:31 +01:00