[Dolibarr-git] [Dolibarr/dolibarr] a8878c: FIX #6295

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a8878c3f7ef342f6eb368bfd8a47e6c7f3959091
      
https://github.com/Dolibarr/dolibarr/commit/a8878c3f7ef342f6eb368bfd8a47e6c7f3959091
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M htdocs/langs/en_US/ldap.lang
    M htdocs/user/card.php

  Log Message:
  -----------
  FIX #6295


  Commit: ba7d3ee97b9ea17c595aa4718ce86f135555d2dc
      
https://github.com/Dolibarr/dolibarr/commit/ba7d3ee97b9ea17c595aa4718ce86f135555d2dc
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    A CODE_OF_CONDUCT.md

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9f00cf1ae149...ba7d3ee97b9e