Laurent Destailleur 64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/expensereport/card.php

2018-03-11 00:10:13 +01:00

..

standard

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

2018-03-11 00:10:13 +01:00

index.html

…

init_menu_auguria.sql

Fix translation

2018-02-06 19:33:31 +01:00