Files
dolibarr/htdocs/core/menus
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
..