Conflicts: ChangeLog htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php htdocs/projet/activity/perday.php htdocs/projet/activity/perweek.php |
||
|---|---|---|
| .. | ||
| api_projects.class.php | ||
| api_tasks.class.php | ||
| index.html | ||
| project.class.php | ||
| projectstats.class.php | ||
| task.class.php | ||
| taskstats.class.php | ||