Prepare for merge

This commit is contained in:
2018-02-24 16:53:17 +01:00
43 changed files with 711 additions and 460 deletions

View File

@@ -1,7 +1,7 @@
<?php
ini_set('display_errors', '1');
date_default_timezone_set('Europe/Oslo');
setlocale(LC_ALL, 'no_NO');
setlocale(LC_ALL, 'nb_NO');
error_reporting(E_ALL);
require __DIR__ . '/../../../inc/navbar.php';
require __DIR__ . '/../../../src/_autoload.php';
@@ -32,7 +32,6 @@ $users = $userManager->getAllUserData();
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" href="../../css/normalize.css">
<link rel="stylesheet" href="../../css/style.css">
<link rel="stylesheet" href="../../css/nav.css">
<link rel="stylesheet" href="../../css/events.css">
<link rel="stylesheet" href="../../css/admin.css">
</head>
@@ -90,4 +89,4 @@ $users = $userManager->getAllUserData();
<input type="submit" class="btn" value="Lagre">
</form>
</main>
</body>
</body>