[Dolibarr-git] [Dolibarr/dolibarr] f65234: Fix travis

[Juanjo Menent]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f65234e44f5094d2f91088f1d9fa17eaf64b4fb2
      
https://github.com/Dolibarr/dolibarr/commit/f65234e44f5094d2f91088f1d9fa17eaf64b4fb2
  Author: aspangaro <address@hidden>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M htdocs/support/index.php

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


  Commit: b4b5dedaa99f14974252cc3de8fc91cbdcd95219
      
https://github.com/Dolibarr/dolibarr/commit/b4b5dedaa99f14974252cc3de8fc91cbdcd95219
  Author: aspangaro <address@hidden>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M htdocs/admin/expensereport.php
    M htdocs/compta/deplacement/index.php
    M htdocs/contact/card.php
    R htdocs/contact/exportimport.php
    M htdocs/core/lib/contact.lib.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/index.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/trips.lang
    M htdocs/projet/class/task.class.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into develop-39


  Commit: 9080470a64ac12ecde1fd2bf001b4d5841136181
      
https://github.com/Dolibarr/dolibarr/commit/9080470a64ac12ecde1fd2bf001b4d5841136181
  Author: Juanjo Menent <address@hidden>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M htdocs/support/index.php

  Log Message:
  -----------
  Merge pull request #3089 from aspangaro/develop-patch39

Fix travis


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0780c840120d...9080470a64ac