[Dolibarr/dolibarr] c27260: FIX #13046 More complete

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c27260869b09652478578b0a689f410cec54cad7
      
https://github.com/Dolibarr/dolibarr/commit/c27260869b09652478578b0a689f410cec54cad7
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-08 (Sat, 08 Feb 2020)

  Changed paths:
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/tpl/card_presend.tpl.php

  Log Message:
  -----------
  FIX #13046 More complete


  Commit: ee29c3efdd0b3e73f34bee1c01f3f70692f4529a
      
https://github.com/Dolibarr/dolibarr/commit/ee29c3efdd0b3e73f34bee1c01f3f70692f4529a
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-08 (Sat, 08 Feb 2020)

  Changed paths:
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/tpl/card_presend.tpl.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5f507b2df555...ee29c3efdd0b