[Dolibarr-git] [Dolibarr/dolibarr] 0fae2b: correct merge

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0fae2ba8ca98897bc7d4d24e60b963d47709994e
      
https://github.com/Dolibarr/dolibarr/commit/0fae2ba8ca98897bc7d4d24e60b963d47709994e
  Author: Frédéric FRANCE <address@hidden>
  Date:   2017-12-29 (Fri, 29 Dec 2017)

  Changed paths:
    M htdocs/contact/list.php

  Log Message:
  -----------
  correct merge


  Commit: affce9c0a75ce0e42522258e086925bbbcc6e5bf
      
https://github.com/Dolibarr/dolibarr/commit/affce9c0a75ce0e42522258e086925bbbcc6e5bf
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-12-31 (Sun, 31 Dec 2017)

  Changed paths:
    M htdocs/contact/list.php

  Log Message:
  -----------
  Merge pull request #8001 from frederic34/patch-1

correct merge


Compare: 
https://github.com/Dolibarr/dolibarr/compare/77be56ff7475...affce9c0a75c