Laurent Destailleur 7e68f9e013 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 ...

Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php

2021-11-06 21:04:17 +01:00

..

admin

…

ajax

…

class

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0

2021-11-06 21:04:17 +01:00

card.php

…

combinations.php

FIx #18313

2021-08-02 20:20:52 +02:00

create_val.php

…

create.php

…

list.php

FIx #18313

2021-08-02 20:20:52 +02:00