[Dolibarr/dolibarr] 7ee37d: FIX Error in log for email sending with smtps was ...

[Laurent Destailleur]

  Branch: refs/heads/10.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7ee37ddd3ff7871e6d58b7bc90edaa74a661a78d
      
https://github.com/Dolibarr/dolibarr/commit/7ee37ddd3ff7871e6d58b7bc90edaa74a661a78d
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-23 (Thu, 23 Jan 2020)

  Changed paths:
    M htdocs/core/class/smtps.class.php

  Log Message:
  -----------
  FIX Error in log for email sending with smtps was not complete


  Commit: 42769e2e7dd65cbcd8b2e086f991d77c9c58cfe5
      
https://github.com/Dolibarr/dolibarr/commit/42769e2e7dd65cbcd8b2e086f991d77c9c58cfe5
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-23 (Thu, 23 Jan 2020)

  Changed paths:
    M htdocs/accountancy/class/accountancyexport.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php

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


  Commit: 80305581174b54dbd29454c1604fc7d648ed20ca
      
https://github.com/Dolibarr/dolibarr/commit/80305581174b54dbd29454c1604fc7d648ed20ca
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-23 (Thu, 23 Jan 2020)

  Changed paths:
    M htdocs/core/class/smtps.class.php

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

Conflicts:
        htdocs/core/class/smtps.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/be344518c498...80305581174b