Laurent Destailleur 3d3a7bfd37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/card.php htdocs/projet/card.php htdocs/projet/contact.php htdocs/projet/element.php htdocs/projet/tasks.php htdocs/projet/tasks/comment.php htdocs/projet/tasks/contact.php htdocs/projet/tasks/document.php htdocs/projet/tasks/note.php htdocs/projet/tasks/task.php htdocs/projet/tasks/time.php		2021-03-20 12:42:46 +01:00
..
doc	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-20 12:42:46 +01:00
index.html
mod_propale_marbre.php	add missing rule	2021-03-01 20:37:16 +01:00
mod_propale_saphir.php	code syntax core directory	2021-02-23 22:03:23 +01:00
modules_propale.php	code syntax core directory	2021-02-23 22:03:23 +01:00