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

..

admin

Fix GETPOST on 'action'

2020-09-16 19:39:50 +02:00

class

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

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

stats

Fix escaping

2020-09-20 02:30:53 +02:00

tpl

Scrutinizer Auto-Fixes

2020-04-10 08:59:32 +00:00

card-rec.php

FIX #yogosha4448

2020-09-17 12:30:14 +02:00

card.php

Merge pull request #14822 from TobiasSekan/FixUnbeautifulErrorOnIntervention

2020-09-27 17:08:36 +02:00

contact.php

Fix GETPOST on 'action'

2020-09-16 19:39:50 +02:00

document.php

Sanitize sortfield

2020-09-18 17:13:01 +02:00

index.php

add new rule

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

info.php

Scrutinizer Auto-Fixes

2020-04-10 08:59:32 +00:00

list.php

Merge branch 'develop' into PreselectThirpartyOnNewFromList

2020-09-23 20:02:48 +02:00

note.php

Fix GETPOST on 'action'

2020-09-16 19:39:50 +02:00