[Dolibarr-git] [Dolibarr/dolibarr] 93c395: FIX confirmation of mass email sending + option MA...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 93c395fe10d6ffe129c936ee49f51d3e9d654c0e
      
https://github.com/Dolibarr/dolibarr/commit/93c395fe10d6ffe129c936ee49f51d3e9d654c0e
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-27 (Mon, 27 May 2019)

  Changed paths:
    M htdocs/comm/mailing/card.php
    M htdocs/core/class/CMailFile.class.php

  Log Message:
  -----------
  FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL


  Commit: 7db643fff0efa54a8a9d70b067422d85734b8c0e
      
https://github.com/Dolibarr/dolibarr/commit/7db643fff0efa54a8a9d70b067422d85734b8c0e
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-27 (Mon, 27 May 2019)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/tpl/extrafields_list_search_sql.tpl.php

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


  Commit: 1c6ddd25c4f8b0eba6446476ff9df640d2e70cdb
      
https://github.com/Dolibarr/dolibarr/commit/1c6ddd25c4f8b0eba6446476ff9df640d2e70cdb
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-27 (Mon, 27 May 2019)

  Changed paths:
    M htdocs/comm/mailing/card.php
    M htdocs/core/class/CMailFile.class.php

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


  Commit: 15de8a9497ff2eb655a3f94910502581e54c650d
      
https://github.com/Dolibarr/dolibarr/commit/15de8a9497ff2eb655a3f94910502581e54c650d
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-27 (Mon, 27 May 2019)

  Changed paths:
    M htdocs/comm/mailing/card.php
    M htdocs/core/class/CMailFile.class.php

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

Conflicts:
        htdocs/comm/mailing/card.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8510a846f415...15de8a9497ff