Merge branch 'master' into marijn-chat

2017-01-11 14:04:53 +01:00
parent eecdcad538 4be13bb66c
commit 916589dac7
19 changed files with 2855 additions and 13 deletions
--- a/website/chat.php
+++ b/website/chat.php
@@ -13,6 +13,9 @@

            /* Add your view files here. */
            include("views/chat-view.php");
+
+                        /* This adds the footer. */
+            include("views/footer.php");
        ?>
    </body>
 </html>