[Dolibarr-git] [Dolibarr/dolibarr] 605dbd: Fix phpunit

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 605dbd61f265aa78f5f055a090d973f0cf16943c
      
https://github.com/Dolibarr/dolibarr/commit/605dbd61f265aa78f5f055a090d973f0cf16943c
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-10 (Sat, 10 Jun 2017)

  Changed paths:
    M test/phpunit/AdherentTest.php

  Log Message:
  -----------
  Fix phpunit


  Commit: 9a30e8edc6d6ac718d4c08b0b228b0f06fe6ca09
      
https://github.com/Dolibarr/dolibarr/commit/9a30e8edc6d6ac718d4c08b0b228b0f06fe6ca09
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-10 (Sat, 10 Jun 2017)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update changelog


  Commit: 6ec038d0056ed16cd2a23d1a47044e2da4c4a824
      
https://github.com/Dolibarr/dolibarr/commit/6ec038d0056ed16cd2a23d1a47044e2da4c4a824
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-10 (Sat, 10 Jun 2017)

  Changed paths:
    M htdocs/comm/card.php
    M htdocs/core/lib/admin.lib.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c2b171dd73a1...6ec038d0056e