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

externals

2018-01-01 11:08:24 +01:00

eloquent

diversen opmerkingen Peter

2018-04-02 17:32:20 +02:00

projects

diversen nav opmerkingen

2018-03-21 17:23:58 +01:00

index.html

initial commit

2017-12-14 10:17:13 +01:00