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

Conflicts:
	htdocs/install/step5.php
	htdocs/langs/en_US/holiday.lang
	htdocs/public/payment/newpayment.php
	htdocs/public/stripe/newpayment.php

2018-03-19 17:58:19 +01:00

..

api_projects.class.php

Clean code

2018-01-24 13:08:09 +01:00

api_tasks.class.php

Resolve bug for REST API PUT task

2017-12-14 11:53:48 +01:00

index.html

…

project.class.php

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

2018-03-19 17:58:19 +01:00

projectstats.class.php

Fix length of month too large

2017-12-08 16:15:41 +01:00

task.class.php

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

2018-03-07 11:54:48 +01:00

taskstats.class.php

Fix length of month too large

2017-12-08 16:15:41 +01:00