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

Conflicts:
	htdocs/adherents/card.php
	htdocs/bom/bom_card.php
	htdocs/core/class/ldap.class.php
	htdocs/core/lib/files.lib.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/admin.lang

2020-09-29 13:28:22 +02:00

..

api_interventions.class.php

Fix escaping

2020-09-20 01:30:36 +02:00

fichinter.class.php

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

2020-09-29 13:28:22 +02:00

fichinterrec.class.php

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

2020-09-29 13:28:22 +02:00

fichinterstats.class.php

Scrutinizer Auto-Fixes

2020-03-12 11:45:44 +00:00

index.html

…