mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-11 16:14:18 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
5a5b07f5a5
|
@ -11,7 +11,6 @@
|
||||||
<link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url('').e($snipeSettings->favicon) : 'favicon.ico' }} ">
|
<link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url('').e($snipeSettings->favicon) : 'favicon.ico' }} ">
|
||||||
{{-- stylesheets --}}
|
{{-- stylesheets --}}
|
||||||
<link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
|
<link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
|
||||||
<link rel="shortcut icon" type="image/ico" href="{{ url(asset('favicon.ico')) }}">
|
|
||||||
|
|
||||||
<script nonce="{{ csrf_token() }}">
|
<script nonce="{{ csrf_token() }}">
|
||||||
window.snipeit = {
|
window.snipeit = {
|
||||||
|
|
Loading…
Reference in a new issue