Laurent Destailleur 94335b186e Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php

2014-05-21 20:30:07 +02:00

..

doc

Qual: Mutualize code.

2014-05-07 13:22:02 +02:00

mod_expedition_ribera.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

mod_expedition_safor.php

Merge remote-tracking branch 'origin/3.5' into develop

2014-05-21 20:30:07 +02:00

modules_expedition.php

Removed closing php tag

2014-05-03 18:18:44 +02:00