Laurent Destailleur 8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php

2014-06-20 15:26:02 +02:00

..

activity

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

admin

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

class

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

2014-06-20 15:26:02 +02:00

tasks

Fix: date start/end of project was lost on some tabs.

2014-06-14 14:20:58 +02:00

contact.php

Fix: date start/end of project was lost on some tabs.

2014-06-14 14:20:58 +02:00

document.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

element.php

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

2014-06-20 15:26:02 +02:00

fiche.php

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

2014-06-20 15:26:02 +02:00

ganttchart.inc.php

Fix: date start/end of project was lost on some tabs.

2014-06-14 14:20:58 +02:00

ganttview.php

Fix: date start/end of project was lost on some tabs.

2014-06-14 14:20:58 +02:00

index.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

jsgantt_language.js.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

liste.php

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

2014-05-10 19:53:06 +02:00

note.php

Fix: date start/end of project was lost on some tabs.

2014-06-14 14:20:58 +02:00

tasks.php

Fix: date start/end of project was lost on some tabs.

2014-06-14 14:20:58 +02:00