Laurent Destailleur c781bb4d08 Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/holiday/fiche.php		2014-08-06 09:12:29 +02:00
..
holiday.class.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-08-06 09:12:29 +02:00