Files
dolibarr/htdocs/hrm
Laurent Destailleur 04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
..
2018-02-26 09:20:05 +01:00
2017-10-25 22:02:07 +02:00
2018-02-15 12:57:04 +01:00