[Dolibarr-git] [Dolibarr/dolibarr] ab9be2: Fix installers

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ab9be29356f548a4ef11745234c12f406171c84c
      
https://github.com/Dolibarr/dolibarr/commit/ab9be29356f548a4ef11745234c12f406171c84c
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
    M build/exe/doliwamp/install.forced.php.install
    M build/rpm/install.forced.php.fedora
    M build/rpm/install.forced.php.generic
    M build/rpm/install.forced.php.mandriva
    M build/rpm/install.forced.php.opensuse
    M htdocs/install/fileconf.php
    M htdocs/install/step1.php

  Log Message:
  -----------
  Fix installers


  Commit: e6e8a014a3c3e4aafbb3af737deb6c811dcb5111
      
https://github.com/Dolibarr/dolibarr/commit/e6e8a014a3c3e4aafbb3af737deb6c811dcb5111
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Prepare 5.0.4


  Commit: 6298436a1bae5e96086e4fd8b3d327133d2081dd
      
https://github.com/Dolibarr/dolibarr/commit/6298436a1bae5e96086e4fd8b3d327133d2081dd
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/migration/repair.sql

  Log Message:
  -----------
  Clean old lot numbers


  Commit: 480587c8263398aad02a1961892a2ce2ab122d45
      
https://github.com/Dolibarr/dolibarr/commit/480587c8263398aad02a1961892a2ce2ab122d45
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Fix travis errors


  Commit: 1b3544e794ac8cb26efe8a0de4b7876f33e5907f
      
https://github.com/Dolibarr/dolibarr/commit/1b3544e794ac8cb26efe8a0de4b7876f33e5907f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0


  Commit: 78ebffe4f1246b45811d2387022da3c98b9afac5
      
https://github.com/Dolibarr/dolibarr/commit/78ebffe4f1246b45811d2387022da3c98b9afac5
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-25 (Sun, 25 Jun 2017)

  Changed paths:
    M ChangeLog
    M build/exe/doliwamp/install.forced.php.install
    M build/rpm/install.forced.php.fedora
    M build/rpm/install.forced.php.generic
    M build/rpm/install.forced.php.mandriva
    M build/rpm/install.forced.php.opensuse
    M htdocs/install/fileconf.php
    M htdocs/install/step1.php

  Log Message:
  -----------
  Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into develop

Conflicts:
        ChangeLog
        htdocs/install/fileconf.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/778e581aca95...78ebffe4f124