[Dolibarr-git] [Dolibarr/dolibarr] 1bb540: FIX #7464

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1bb5408d837feea388d9abd1959a1df33fd9cb70
      
https://github.com/Dolibarr/dolibarr/commit/1bb5408d837feea388d9abd1959a1df33fd9cb70
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-24 (Sun, 24 Sep 2017)

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

  Log Message:
  -----------
  FIX #7464


  Commit: 3a7aea48d76d82f2a4de61785b13caa014d641be
      
https://github.com/Dolibarr/dolibarr/commit/3a7aea48d76d82f2a4de61785b13caa014d641be
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-24 (Sun, 24 Sep 2017)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php

  Log Message:
  -----------
  FIX #7475


  Commit: 554a640c2bb135d1cd953466422a285472ceaf34
      
https://github.com/Dolibarr/dolibarr/commit/554a640c2bb135d1cd953466422a285472ceaf34
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-24 (Sun, 24 Sep 2017)

  Changed paths:
    M htdocs/contrat/class/contrat.class.php
    M htdocs/resource/list.php
    M htdocs/stripe/config.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/73494a23dfcd...554a640c2bb1