Laurent Destailleur 8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/hrm/hrm.php

2016-08-31 16:16:19 +02:00

..

index.php

FIX Several problems when using smartphone

2016-08-31 12:38:54 +02:00

perday.php

Fix edit of progess only

2016-07-09 14:28:33 +02:00

perweek.php

Merge remote-tracking branch 'origin/4.0' into develop

2016-08-05 01:15:19 +02:00