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
..
standard	Debug v14	2021-06-26 15:39:52 +02:00
init_menu_auguria.sql	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0	2021-06-29 15:58:26 +02:00