Laurent Destailleur c575d26703 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 ...

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/menus/standard/eldy.lib.php

2024-04-11 22:19:08 +02:00

..

conferenceorbooth.class.php

Fix bad function

2024-02-25 19:04:05 +01:00

conferenceorboothattendee.class.php

Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0

2024-04-11 22:19:08 +02:00