Laurent Destailleur 89ad634230 Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/langs/fr_FR/holiday.lang

2013-04-22 01:39:49 +02:00

..

edit.php

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

2013-04-22 01:39:49 +02:00

index.php

New: enhance tool fixdosfiles.sh

2013-03-30 14:27:13 +01:00

other.php

fix : trad error

2013-03-24 07:11:44 +01:00