Laurent Destailleur 1cdea45707 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ...

develop

Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/societe/canvas/company/tpl/card_create.tpl.php
	htdocs/societe/canvas/individual/tpl/card_create.tpl.php
	htdocs/societe/card.php

2021-03-01 17:46:36 +01:00

..

admin

code syntax s... t.. dir

2021-02-26 21:17:52 +01:00

ajax

code syntax s... t.. dir

2021-02-26 21:17:52 +01:00

canvas

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

2021-03-01 17:46:36 +01:00

checkvat

code syntax s... t.. dir

2021-02-26 21:17:52 +01:00

class

Merge pull request #16474 from bafbes/abb120370

2021-03-01 14:16:14 +01:00

notify

Merge remote-tracking branch 'upstream/develop' into s_code_syntax

2021-02-28 17:49:17 +01:00

tpl

code syntax s... t.. dir

2021-02-26 21:17:52 +01:00

agenda.php

code syntax s... t.. dir

2021-02-26 21:17:52 +01:00

ajaxcompanies.php

code syntax s... t.. dir

2021-02-26 21:17:52 +01:00

ajaxcountries.php

code syntax s... t.. dir

2021-02-26 21:17:52 +01:00

card.php

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

2021-03-01 17:46:36 +01:00

consumption.php

Merge remote-tracking branch 'upstream/develop' into s_code_syntax

2021-02-28 17:49:17 +01:00

contact.php

code syntax s... t.. dir

2021-02-26 21:17:52 +01:00

document.php

Merge remote-tracking branch 'upstream/develop' into s_code_syntax

2021-02-28 17:49:17 +01:00

index.php

code syntax s... t.. dir

2021-02-26 21:17:52 +01:00

list.php

code syntax s... t.. dir

2021-02-26 21:17:52 +01:00

note.php

Merge remote-tracking branch 'upstream/develop' into s_code_syntax

2021-02-28 17:49:17 +01:00

paymentmodes.php

Merge remote-tracking branch 'upstream/develop' into s_code_syntax

2021-02-28 17:49:17 +01:00

price.php

code syntax s... t.. dir

2021-02-26 21:17:52 +01:00

project.php

Merge remote-tracking branch 'upstream/develop' into s_code_syntax

2021-02-28 17:49:17 +01:00

societecontact.php

code syntax s... t.. dir

2021-02-26 21:17:52 +01:00

website.php

code syntax s... t.. dir

2021-02-26 21:17:52 +01:00