Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
[platal.git] / upgrade / 1.0.1 / merge.php
2010-11-02 Stéphane JacobMerge remote branch 'origin/platal-1.0.1'
2010-11-01 Stéphane JacobPrevents empty education inclusions.
2010-10-26 Florent BruneauMerge remote branch 'origin/platal-1.0.1'
2010-10-26 Stéphane JacobFixes nationalities merge.
2010-10-25 Stéphane JacobPrevents joins in merge.php.
2010-10-25 Florent BruneauMerge remote branch 'origin/platal-1.0.0' into platal...
2010-10-25 Stéphane JacobFixes merge.php (it now works properly in a reasonable...
2010-10-20 Stéphane JacobUpdates merge script: direct use of MySQL is much faste...
2010-10-16 Florent BruneauMerge remote branch 'origin/platal-1.0.1'
2010-10-15 Stéphane JacobMerge