Merge branch 'master' into lars-search

2017-01-12 14:37:01 +01:00
parent 0e44fb34c0 6c9841483a
commit fd171d01f3
14 changed files with 464 additions and 77 deletions
--- a/website/views/head.php
+++ b/website/views/head.php
@@ -14,7 +14,7 @@
        @import url("styles/menu.css");
        @import url("styles/footer.css");
        @import url("styles/search.css");
-
+        @import url("styles/adminpanel.css");
        @import url("styles/chat.css");
    </style>
 </head>