fixed merge

2017-01-11 11:13:04 +01:00
parent e90ecda436 8d0f2d40b7
commit c354bdb330
8 changed files with 116 additions and 1 deletions
--- a/website/views/head.php
+++ b/website/views/head.php
@@ -6,6 +6,7 @@
    <style>
        /* Add your css files here. */
        @import url("styles/main.css");
+        @import url("styles/chat.css");
        @import url("styles/font-awesome.css");
        @import url("styles/header.css");
        @import url("styles/menu.css");