Merge branch 'develop' into feature/server-mounts

This commit is contained in:
Matthew Penner 2020-07-11 12:29:30 -06:00 committed by GitHub
commit 295f09ca43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
195 changed files with 5395 additions and 5417 deletions

View file

@ -30,9 +30,13 @@
</script>
@endif
@show
<style>
@import url('//fonts.googleapis.com/css?family=Rubik:300,400,500&display=swap');
@import url('//fonts.googleapis.com/css?family=IBM+Plex+Mono|IBM+Plex+Sans:500&display=swap');
</style>
@section('assets')
{!! $asset->css('main.css') !!}
{{-- {!! $asset->css('main.css') !!}--}}
@show
@include('layouts.scripts')