[Dolibarr-cvs] dolibarr .settings/org.eclipse.php.core.prefs h... [DOLIBARR_3_1_BRANCH]

[Laurent Destailleur]

CVSROOT:        /cvsroot/dolibarr
Module name:    dolibarr
Branch:         DOLIBARR_3_1_BRANCH
Changes by:     Laurent Destailleur <eldy>      11/09/15 19:51:30

Modified files:
        .settings      : org.eclipse.php.core.prefs 
        htdocs/install/mysql/migration: 3.0.0-3.1.0.sql 

Log message:
        Merge branch '3.1-beta' of address@hidden:Dolibarr/dolibarr.git into
        3.1-beta
        
        Conflicts:
                htdocs/install/mysql/migration/3.0.0-3.1.0.sql

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dolibarr/.settings/org.eclipse.php.core.prefs?cvsroot=dolibarr&only_with_tag=DOLIBARR_3_1_BRANCH&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/install/mysql/migration/3.0.0-3.1.0.sql?cvsroot=dolibarr&only_with_tag=DOLIBARR_3_1_BRANCH&r1=1.85.2.1&r2=1.85.2.2