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

Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php

2014-05-29 19:20:48 +02:00

..

actioncomm.class.php

fix english misspelling

2014-03-05 09:57:36 +01:00

cactioncomm.class.php

Removed closing php tag

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

ical.class.php

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

2014-05-29 19:20:48 +02:00