Laurent Destailleur 146c521efd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/filefunc.inc.php

2020-06-29 18:06:42 +02:00

..

mailings

add new rule

2020-05-21 09:35:30 +02:00

mymodule

Clean template

2020-06-26 01:14:24 +02:00

modMyModule.class.php

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

2020-06-29 18:06:42 +02:00