Laurent Destailleur 657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php

2014-12-26 04:44:15 +01:00

..

contact.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2014-12-26 04:44:15 +01:00

document.php

Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs

2014-12-22 22:52:43 +01:00

index.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2014-12-26 04:44:15 +01:00

note.php

Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs

2014-12-22 22:52:43 +01:00

task.php

Fix: Several fixes into tasks and time spent management

2014-12-21 14:58:18 +01:00

time.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2014-12-26 04:44:15 +01:00