[Dolibarr-git] [Dolibarr/dolibarr] 0eabf2: Fix: Checkstyle

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0eabf26d270a87e5c0634fe7467bed662cea90c1
      
https://github.com/Dolibarr/dolibarr/commit/0eabf26d270a87e5c0634fe7467bed662cea90c1
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  Fix: Checkstyle


  Commit: 869bde5fb0e9daa44e9688761aff2199810183b9
      
https://github.com/Dolibarr/dolibarr/commit/869bde5fb0e9daa44e9688761aff2199810183b9
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Fix: Ignore vagrant dir into CI

Conflicts:
        .travis.yml


  Commit: 0e78e631c1fc111b6fa8e915478c4c385c5a60c6
      
https://github.com/Dolibarr/dolibarr/commit/0e78e631c1fc111b6fa8e915478c4c385c5a60c6
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M .travis.yml
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        .travis.yml


Compare: 
https://github.com/Dolibarr/dolibarr/compare/36e6f9a9fcb3...0e78e631c1fc