dolibarr/htdocs/core/modules/expedition
Laurent Destailleur b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
2014-03-31 00:44:45 +02:00
..
doc Merge remote-tracking branch 'origin/3.5' into develop 2014-03-31 00:44:45 +02:00
mod_expedition_ribera.php Fix: Use correct translation key 2013-09-25 19:07:25 +02:00
mod_expedition_safor.php Fix: Permissions on files 2013-08-06 00:36:04 +02:00
modules_expedition.php Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 2013-07-11 15:55:33 +02:00