Laurent Destailleur 17d2c3cb08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/website/class/websitepage.class.php

2021-10-07 16:10:48 +02:00

..

website.class.php

Clean code

2021-09-30 15:59:47 +02:00

websitepage.class.php

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

2021-10-07 16:10:48 +02:00