Laurent Destailleur 67820774bb Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php

2013-07-27 14:21:47 +02:00

..

contact.php

standardize code

2013-06-20 09:18:12 +02:00

document.php

Fix: broken features for fileupload

2013-04-22 14:39:25 +02:00

index.php

Better code quality for [ task #531 ] Add a duration on tasks

2013-05-15 14:19:16 +02:00

note.php

Fixed more private note updates

2013-04-20 06:43:14 +02:00

task.php

[ task #924 ] Add numbering rule on task

2013-07-18 10:24:45 +02:00

time.php

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

2013-07-27 14:21:47 +02:00