[Dolibarr-git] [Dolibarr/dolibarr] 15138a: FIX error on setup of password if pass generators ...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 15138aa543e63d5083d9b2e4fbb250bca56bb891
      
https://github.com/Dolibarr/dolibarr/commit/15138aa543e63d5083d9b2e4fbb250bca56bb891
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-04 (Mon, 04 Mar 2019)

  Changed paths:
    M htdocs/admin/security.php

  Log Message:
  -----------
  FIX error on setup of password if pass generators have a .old file.


  Commit: 54b9681257171e9c15215290f71295bb09384344
      
https://github.com/Dolibarr/dolibarr/commit/54b9681257171e9c15215290f71295bb09384344
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-04 (Mon, 04 Mar 2019)

  Changed paths:
    M htdocs/core/login/functions_dolibarr.php

  Log Message:
  -----------
  More log to help debug


  Commit: c95c8b4dcb6736b75bb47dd9670fc352f9625396
      
https://github.com/Dolibarr/dolibarr/commit/c95c8b4dcb6736b75bb47dd9670fc352f9625396
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-04 (Mon, 04 Mar 2019)

  Changed paths:
    M htdocs/core/login/functions_dolibarr.php

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

Conflicts:
        htdocs/core/login/functions_dolibarr.php


  Commit: 1cfbf5f551cdbecdd813aa9939542b34bea34f86
      
https://github.com/Dolibarr/dolibarr/commit/1cfbf5f551cdbecdd813aa9939542b34bea34f86
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-04 (Mon, 04 Mar 2019)

  Changed paths:
    M htdocs/admin/security.php
    M htdocs/core/login/functions_dolibarr.php

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

Conflicts:
        htdocs/admin/security.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1d6028dfb0db...1cfbf5f551cd