Laurent Destailleur 2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/public/project/suggestbooth.php htdocs/public/project/suggestconference.php		2021-10-07 11:01:53 +02:00
..
index.php	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-10-07 11:01:53 +02:00
new.php	HTML5 - <font> tag is deprecated, replace by <span>	2021-10-05 10:01:37 +02:00
suggestbooth.php	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-10-07 11:01:53 +02:00
suggestconference.php	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-10-07 11:01:53 +02:00
viewandvote.php	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-10-07 11:01:53 +02:00