Maxime Kohlhaas 3c7f4a3548 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 ... Conflicts: htdocs/admin/system/perf.php		2013-07-11 15:55:33 +02:00
..
doc	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862	2013-07-11 15:55:33 +02:00
mod_expedition_ribera.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
mod_expedition_safor.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
modules_expedition.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862	2013-07-11 15:55:33 +02:00