Merge branch 'master' into marijn-settings

2017-01-17 13:43:41 +01:00
parent be26e89dbf 429fba997f
commit 1edf051dc2
6 changed files with 67 additions and 14 deletions
--- a/website/views/head.php
+++ b/website/views/head.php
@@ -13,3 +13,8 @@
    @import url("styles/menu.css");
    @import url("styles/footer.css");
 </style>
+<?php
+
+include_once("../connect.php");
+
+?>