Merge branch 'master' into hendrik-testing

2017-01-20 15:39:44 +01:00
parent 4218860936 064fe93ba7
commit b1348a3d0e
16 changed files with 138 additions and 125 deletions
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -3,7 +3,7 @@
 <head>
    <meta charset="utf-8">
    <title>Admin Panel</title>
-    <script src="../public/js/admin.js" charset="utf-8"></script>
+    <script src="/js/admin.js" charset="utf-8"></script>
    <?php
        include_once("../queries/user.php");
        include_once("../queries/group_page.php");