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_establishment.php

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

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

admin_hrm.php

psr2

2019-02-02 18:25:01 +01:00

index.html

…