[Dolibarr-git] [Dolibarr/dolibarr] ff6f5e: Fix travis errors

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ff6f5eea6f2ff00f91852ba39fe1d4f029fc2c61
      
https://github.com/Dolibarr/dolibarr/commit/ff6f5eea6f2ff00f91852ba39fe1d4f029fc2c61
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M htdocs/adherents/class/api_members.class.php
    M htdocs/api/class/api.class.php

  Log Message:
  -----------
  Fix travis errors


  Commit: 1216b6f1d8b110de212552f14d5acc1ea2f08590
      
https://github.com/Dolibarr/dolibarr/commit/1216b6f1d8b110de212552f14d5acc1ea2f08590
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M htdocs/societe/consumption.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/68d70e9ebadc...1216b6f1d8b1