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

develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php

2015-06-23 18:34:39 +02:00

..

doc

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

2015-06-23 18:34:39 +02:00

modules_expensereport.php

Minor cosmetic changes

2015-05-15 02:34:57 +02:00