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

Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/projet/list.php
	htdocs/user/card.php

2017-10-13 22:01:56 +02:00

..

index.php

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

2017-10-13 22:01:56 +02:00