[Dolibarr-git] [Dolibarr/dolibarr] c2b503: Fix missing filter

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c2b503d90fd87bf1caec3e69714efe952a0bc1af
      
https://github.com/Dolibarr/dolibarr/commit/c2b503d90fd87bf1caec3e69714efe952a0bc1af
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-08-31 (Wed, 31 Aug 2016)

  Changed paths:
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  Fix missing filter


  Commit: 8352f64474e556655d60b125db66359a05188a6c
      
https://github.com/Dolibarr/dolibarr/commit/8352f64474e556655d60b125db66359a05188a6c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-08-31 (Wed, 31 Aug 2016)

  Changed paths:
    M htdocs/langs/en_US/projects.lang
    M htdocs/projet/tasks/time.php

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

Conflicts:
        htdocs/projet/tasks/time.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/524dd791984e...8352f64474e5