Merge branch 'devel'

Author: rakieta2015

composer.json

@@ -10,7 +10,7 @@
     "require": {
         "php": "^7.2.5",
         "fideloper/proxy": "^4.2",
-        "laravel/framework": "^7.0",
+        "laravel/framework": "^7.4",
         "fruitcake/laravel-cors": "^1.0",
         "guzzlehttp/guzzle": "^6.3",
         "laravel/tinker": "^2.3.0",

resources/views/dashboard/base.blade.php

@@ -76,8 +76,8 @@ function gtag() {
           @yield('content') 
 
         </main>
+        @include('dashboard.shared.footer')
       </div>
-      @include('dashboard.shared.footer')
     </div>