Laurent Destailleur c8d0476728 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php		2020-06-01 04:09:52 +02:00
..
boxes	Reindent module template	2020-05-01 08:40:55 +02:00
modules	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-01 04:09:52 +02:00
tpl	Reindent module template	2020-05-01 08:40:55 +02:00
triggers	Reindent module template	2020-05-01 08:40:55 +02:00