Merge branch 'master' into v1.2

# Conflicts: # resources/views/app.blade.php
8 years ago · dce553c587
1 changed files with 2 additions and 2 deletions
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@ -7,7 +7,7 @@

        <title>{{ config('app.name') }}</title>

-        <link rel="stylesheet" href="{{ mix('/css/app.css') }}" type="text/css" />
+        <link rel="stylesheet" href="{{ mix('css/app.css') }}" type="text/css" />

    </head>
    <body>
@ -76,7 +76,7 @@
        <script src="//ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
        <script>!window.jQuery && document.write('<script src="/js/jquery-3.3.1.min.js"><\/script>')</script>
        <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
-        <script src="/js/app.js"></script>
+        <script src="{{ asset('js/app.js') }}"></script>
        @yield('scripts')
        
    </body>