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
..
admin	Replaced "Jours" with DurationDays translation key	2013-05-06 17:48:20 +02:00
class	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into holidays-improvements	2013-05-06 17:22:31 +02:00
img
common.inc.php	Fix: dead code	2013-06-09 16:15:12 +02:00
define_holiday.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-07-27 14:21:47 +02:00
fiche.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-05-14 01:15:05 +02:00
index.php	Improvement to holidays module	2013-05-12 11:38:17 +02:00
month_report.php	Missing translations	2013-05-06 17:47:53 +02:00
view_log.php	Missing translations	2013-05-06 17:47:53 +02:00