Merge branch 'master' into feature/dashboard

# Conflicts: # application/models/eloquent/Projectemployee.php
2020-01-10 17:43:05 +01:00
parent 1295814ff4 5594865554
commit 090cc90de1
35 changed files with 6932 additions and 1991 deletions
@@ -9,7 +9,7 @@

    <link rel="icon" href="css/images/dbo-01-80x80.png" type="image/png">

-    <title>** De Beleidsonderzoeker **</title>
+    <title>** De Beleidsonderzoekers **</title>

    <?php $this->load->view( 'partials/_css' ); ?>