Laurent Destailleur 034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/eventorganization/class/conferenceorbooth.class.php htdocs/langs/en_US/eventorganization.lang htdocs/public/eventorganization/attendee_subscription.php		2021-09-08 22:13:35 +02:00
..
conferenceorbooth.class.php	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-09-08 22:13:35 +02:00
conferenceorboothattendee.class.php	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-09-08 22:13:35 +02:00