Laurent Destailleur 07bc933110 Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into ... marcosgdf-bug-1405 Conflicts: ChangeLog		2014-05-23 20:21:41 +02:00
..
doc	Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into	2014-05-23 20:21:41 +02:00
mod_expedition_ribera.php	Fix: Use correct translation key	2013-09-25 19:07:25 +02:00
mod_expedition_safor.php	Fix: CRLF	2014-05-21 19:54:40 +02:00
modules_expedition.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862	2013-07-11 15:55:33 +02:00