[Dolibarr-git] [Dolibarr/dolibarr] a64084: Fix: [ bug #1804 ] SQL error when sending email wi...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a64084308d2c58d1f4ef89520a611ca050e775a5
      
https://github.com/Dolibarr/dolibarr/commit/a64084308d2c58d1f4ef89520a611ca050e775a5
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Fix: [ bug #1804 ] SQL error when sending email without addresee


  Commit: cef48d1275576192606c065a685b7daa9cecd25a
      
https://github.com/Dolibarr/dolibarr/commit/cef48d1275576192606c065a685b7daa9cecd25a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Merge branch 'bug-1804' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1804

Conflicts:
        ChangeLog


  Commit: c1f3d66686a853014c55aab1610d69c8ee85b886
      
https://github.com/Dolibarr/dolibarr/commit/c1f3d66686a853014c55aab1610d69c8ee85b886
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1804' into 3.6


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0513ce25e50c...c1f3d66686a8