Laurent Destailleur d19ec89bf1 Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/core/modules/modHoliday.class.php htdocs/holiday/card.php		2015-09-03 23:27:47 +02:00
..
doc	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-09-03 23:27:47 +02:00
index.html
mod_arctic.php
mod_pacific.php
modules_fichinter.php