Laurent Destailleur 9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php		2016-02-19 04:46:11 +01:00
..
index.php	Merge remote-tracking branch 'origin/3.9' into develop	2016-02-19 04:46:11 +01:00