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

Conflicts:
	htdocs/core/modules/modCategorie.class.php

2020-12-04 21:55:57 +01:00

..

code

add new rule

2020-05-21 15:05:19 +02:00

ical

spelling fixes

2019-02-10 12:59:09 +01:00

ldap

Merge pull request #13213 from dolibit-ut/patch-11

2020-02-26 16:19:15 +01:00

mail

Minor code and doc enhancement

2020-08-20 19:00:43 +02:00

zapier

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

2020-12-04 21:55:57 +01:00