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	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-06-04 19:03:27 +02:00
class	add visibility	2019-03-01 23:08:57 +01:00
establishment	FIX Duplicate encoding on error message	2019-05-29 09:51:45 +02:00
index.html
index.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-03-14 19:23:59 +01:00