Merge branch 'master' into marijn-settings

2017-01-12 14:21:28 +01:00
parent eeedbe5c05 6c9841483a
commit 10558a6877
13 changed files with 462 additions and 76 deletions
--- a/website/views/head.php
+++ b/website/views/head.php
@@ -13,6 +13,7 @@
        @import url("styles/header.css");
        @import url("styles/menu.css");
        @import url("styles/footer.css");
+        @import url("styles/adminpanel.css");
        @import url("styles/chat.css");
        @import url("styles/settings.css");
    </style>