Updates merge module.
authorStéphane Jacob <sj@m4x.org>
Wed, 20 Oct 2010 11:35:29 +0000 (13:35 +0200)
committerStéphane Jacob <sj@m4x.org>
Wed, 20 Oct 2010 11:36:09 +0000 (13:36 +0200)
commite48763dcb0ddaa3189273aaec566463945720b8a
tree2673c34d6cba178ca752dffabc2daf8fd5e8f38c
parentf2d397df81eb949f846d5a06127f7d72e8b9105d
Updates merge module.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
modules/fusionax.php
modules/fusionax/Activites.sql
modules/fusionax/Adresses.sql
modules/fusionax/Anciens.sql
modules/fusionax/Entreprises.sql
modules/fusionax/Formations.sql
modules/fusionax/formation.pl