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

Conflicts:
	htdocs/core/modules/delivery/doc/pdf_storm.modules.php
	htdocs/core/modules/reception/doc/pdf_squille.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php

2021-06-29 15:58:26 +02:00

..

canvas

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

2021-06-15 22:17:53 +02:00

class

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

2021-06-29 15:58:26 +02:00

agenda.php

Update agenda.php

2021-06-14 11:02:43 +02:00

card.php

Scrutinizer Auto-Fixes

2021-06-14 13:37:02 +00:00

consumption.php

Work on split module fournisseur

2021-04-11 22:25:45 +02:00

document.php

Fix permission

2021-06-08 16:19:21 +02:00

info.php

code syntax contact directory

2021-02-23 21:16:15 +01:00

ldap.php

Uniformize translation

2021-03-16 04:22:55 +01:00

list.php

Fix token for ajax call

2021-06-17 03:37:52 +02:00

note.php

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

2021-04-13 20:19:05 +02:00

perso.php

Clean code

2021-06-10 00:09:38 +02:00

vcard.php

code syntax contact directory

2021-02-23 21:16:15 +01:00