Laurent Destailleur 21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ...

Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php

2019-06-04 19:03:27 +02:00

..

admin

PSR2 space after comma in function call

2019-01-27 11:55:16 +01:00

class

FIX Duplicate encoding on error message

2019-05-29 09:51:45 +02:00

stats

update with html5 compliant code

2019-02-04 13:51:39 +01:00

tpl

Update linkedobjectblock.tpl.php

2019-05-29 11:26:04 +02:00

card.php

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

2019-06-04 19:03:27 +02:00

contact.php

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

2019-01-27 23:23:38 +01:00

document.php

Look and feel v10

2019-03-29 13:26:26 +01:00

fiche-rec.php

Bad cut and paste

2019-05-21 12:17:07 +02:00

index.html

…

info.php

PSR2 space after comma in function call

2019-01-27 11:55:16 +01:00

invoicetemplate_list.php

update with html5 compliant code

2019-02-10 10:16:58 +01:00

list.php

Merge pull request #11026 from atm-john/new_look_and_feel_title_button

2019-05-18 16:04:47 +02:00

note.php

PSR2 space after comma in function call

2019-01-27 11:55:16 +01:00

prelevement.php

update with html5 compliant code

2019-02-10 10:23:37 +01:00