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
@@ -92,7 +92,7 @@
        </div>

        <footer class="page-copyright page-copyright-inverse">
-            <p>© 2018. De Beleidsonderzoeker.</p>
+            <p>© 2018. De Beleidsonderzoekers</p>
 <!--            <p style="font-size:.8em">powered by: Pensare Software</p>-->
        </footer>
    </div>