Laurent Destailleur fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ...

Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php

2021-10-26 13:29:47 +02:00

..

barcodes

…

sRGB.icc

…

tcpdf_colors.php

…

tcpdf_filters.php

…

tcpdf_font_data.php

…

tcpdf_fonts.php

…

tcpdf_images.php

…

tcpdf_static.php

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

2021-10-26 13:29:47 +02:00