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

..

doc

fix indent

2020-02-24 15:10:36 +01:00

mod_myobject_advanced.php

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

2020-04-03 18:07:24 +02:00

mod_myobject_standard.php

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

2020-04-03 18:07:24 +02:00

modules_myobject.php

Fix doc

2020-04-03 18:01:54 +02:00