Laurent Destailleur 38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/core/class/commonobjectline.class.php htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php htdocs/public/project/index.php		2021-09-01 17:52:04 +02:00
..
index.php	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-09-01 17:52:04 +02:00
new.php
suggestbooth.php	Fix duplicate ;	2021-08-31 20:15:41 +02:00
suggestconference.php	Fix duplicate ;	2021-08-31 20:15:41 +02:00
viewandvote.php	Fix duplicate ;	2021-08-31 20:15:41 +02:00