theo 2f3b1439e8 Merge branch 'master' of bitbucket.org:pensare/dbois ...

# Conflicts:
#	application/controllers/projects/EmployeeHoursController.php
#	application/views/pages/employeehours_view.php
#	public/js/lib/modules/projects/employeehoursModule.js

2018-04-02 17:34:19 +02:00

..

beheer

Monthly hours and revenues per employee report

2018-03-01 10:43:58 +01:00

login

diversen

2017-12-27 13:46:56 +01:00

projects

Merge branch 'master' of bitbucket.org:pensare/dbois

2018-04-02 17:34:19 +02:00

reports

Merge branch 'master' of bitbucket.org:pensare/dbois

2018-04-02 17:34:19 +02:00

specials

Users ready

2017-12-29 14:44:18 +01:00

menuModule.js

Offers

2018-01-10 14:09:34 +01:00