Laurent Destailleur 570275cd76 Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/opensurvey.lang htdocs/opensurvey/public/index.php		2013-06-21 15:37:17 +02:00
..
auguria_menu.php	Several fixes in CSS	2013-06-19 17:02:09 +02:00
auguria.lib.php	CR fix	2013-06-16 21:33:05 +02:00
eldy_menu.php	Several fixes in CSS	2013-06-19 17:02:09 +02:00
eldy.lib.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-06-21 15:37:17 +02:00
empty.php	Several fixes in CSS	2013-06-19 17:02:09 +02:00
index.php