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

Fix : bad call of extrafields into contact substitution (works with socpeople)

2014-05-10 18:51:54 +02:00

mod_codeclient_elephant.php

Removed closing php tag

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

mod_codeclient_leopard.php

Removed closing php tag

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

mod_codeclient_monkey.php

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

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

mod_codecompta_aquarium.php

Removed closing php tag

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

mod_codecompta_panicum.php

Removed closing php tag

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

modules_societe.class.php

Removed closing php tag

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