Laurent Destailleur 28a1b7af35 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/modulebuilder/index.php htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php htdocs/supplier_proposal/class/supplier_proposal.class.php		2020-04-03 18:07:24 +02:00
..
actions_mymodule.class.php	Enhance modulebuilder	2020-03-08 18:28:31 +01:00
api_mymodule.class.php	Fix doxygen	2020-02-20 13:54:41 +01:00
myobject.class.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-04-03 18:07:24 +02:00