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
..
mailings	add new rule	2020-05-21 09:35:30 +02:00
mymodule	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-01 04:09:52 +02:00
modMyModule.class.php	Fix template	2020-05-29 21:48:27 +02:00