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

..

3.0.0-3.1.0.sql

…

3.1.0-3.2.0.sql

…

3.2.0-3.3.0.sql

Fix migration

2020-09-25 12:22:24 +02:00

3.3.0-3.4.0.sql

Fix migration

2020-09-25 12:36:32 +02:00

3.4.0-3.5.0.sql

…

3.5.0-3.6.0.sql

Fix a duplicated index

2020-04-20 12:21:13 +02:00

3.6.0-3.7.0.sql

…

3.7.0-3.8.0.sql

…

3.8.0-3.9.0.sql

…

3.9.0-4.0.0.sql

…

4.0.0-5.0.0.sql

…

5.0.0-6.0.0.sql

…

6.0.0-7.0.0.sql

…

7.0.0-8.0.0.sql

…

8.0.0-9.0.0.sql

Fix size of field

2020-05-09 21:56:51 +02:00

9.0.0-10.0.0.sql

…

10.0.0-11.0.0.sql

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

2020-09-23 19:29:07 +02:00

11.0.0-12.0.0.sql

FIX #14530

2020-08-27 21:52:25 +02:00

12.0.0-13.0.0.sql

Fix export of various payments.

2020-09-28 18:49:20 +02:00

index.html

…

repair.sql

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

2020-06-07 18:59:49 +02:00