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

Conflicts: skolehjem/app/Http/Controllers/WashingReservationController.php
2020-08-04 16:52:42 +02:00
parent 1011165ca0 4f1ff3a823
commit 64d1f785f9
15 changed files with 52 additions and 333 deletions
@@ -7,6 +7,7 @@
@section("content")
    <main>
        <h1 class="text-center sde-blue mb-0">Booking Liste</h1>
+        {!! session()->get('ReservationExists') !!}
        <div class="col w-100 mt-auto">
            <div class="calendar-container">
                <div class="calendar-container__header">