[Dolibarr-git] [Dolibarr/dolibarr] 19b891: FIX #6881

[Laurent Destailleur]

  Branch: refs/heads/5.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 19b8918caf5ec68a00fe94af99d6bebeb3748570
      
https://github.com/Dolibarr/dolibarr/commit/19b8918caf5ec68a00fe94af99d6bebeb3748570
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M htdocs/install/upgrade2.php

  Log Message:
  -----------
  FIX #6881


  Commit: d2813eabbcad08127c92d07534b7554b33c43d77
      
https://github.com/Dolibarr/dolibarr/commit/d2813eabbcad08127c92d07534b7554b33c43d77
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_projet.sql

  Log Message:
  -----------
  FIX #6877

Conflicts:
        htdocs/install/mysql/migration/5.0.0-6.0.0.sql


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ab5545d02d19...d2813eabbcad