Merge branch 'master' into 'joey-testing'

# Conflicts: # website/views/login_head.php
2017-01-20 16:06:16 +01:00
parent e17a55e82d 7e3648d36c
commit 82fc1e5266
22 changed files with 548 additions and 225 deletions
--- a/website/views/login_head.php
+++ b/website/views/login_head.php
@@ -3,10 +3,10 @@
    <title>MyHyvesbook+</title>
    <link rel="stylesheet"
          type="text/css"
-          href="styles/main.css">
+          href="/styles/main.css">
    <link rel="stylesheet"
          type="text/css"
          href="styles/index.css">
    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
    <script src="registerAndLogin.js"></script>
-</head>
+</head>