Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

Browse Source

Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/projet/class/task.class.php

...

This commit is contained in:

Laurent Destailleur 2017-10-27 02:30:33 +02:00

parent ef61407d95 8ac7dd8e9a

commit fed0f3d09e

2 changed files with 55 additions and 55 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files