Laurent Destailleur 90ddfc3f7f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/translation.php		2018-01-11 01:14:20 +01:00
..
doc_generic_user_odt.modules.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-11 01:14:20 +01:00