Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

Conflicts: skolehjem/resources/views/admin/layout/base.blade.php skolehjem/resources/views/app/layout/base.blade.php skolehjem/routes/web.php
2020-06-29 10:15:56 +02:00
parent c823bdd963 d4abbfc189
commit 03c609175d
9 changed files with 42 additions and 56 deletions
@@ -45,6 +45,10 @@
        <img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
        Vagttelefon
    </a>
+    <a href="#">
+        <img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
+        Konto
+    </a>
 </div>

@yield("content")