Laurent Destailleur 25c6b64b1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 ... Conflicts: htdocs/core/modules/delivery/doc/pdf_storm.modules.php htdocs/core/modules/reception/doc/pdf_squille.modules.php htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php		2021-06-29 15:58:26 +02:00
..
boxes	doxygen	2021-03-16 19:07:07 +01:00
modules	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0	2021-06-29 15:58:26 +02:00
tpl	code syntax m... directories	2021-02-26 18:26:44 +01:00
triggers	Clean dead code	2021-05-17 08:58:02 +02:00