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

..

employeehoursModule.js

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

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

offersModule.js

projecten

2018-01-23 08:45:44 +01:00

projectsModule.js

employeehours

2018-01-31 21:56:13 +01:00