Files
dolibarr/htdocs/core/modules/export
Laurent Destailleur 4f464eb226 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/modules/export/export_excel2007.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/langs/fr_FR/agenda.lang
	htdocs/langs/fr_FR/errors.lang
2013-08-01 17:42:18 +02:00
..
2013-06-05 16:24:32 +02:00