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

Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php

2017-09-12 13:26:25 +02:00

..

doc

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

2017-09-12 13:26:25 +02:00

modules_user.class.php

NEW odt usergroup

2017-03-08 11:34:21 +01:00