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
..
standard	Merge remote-tracking branch 'origin/3.4' into develop	2013-06-21 15:37:17 +02:00
index.php	Fix: add empty index files	2011-10-24 15:27:10 +02:00
init_menu_auguria.sql	Merge remote-tracking branch 'origin/3.4' into develop	2013-06-21 15:37:17 +02:00