Merge branch 'v0.20' to gain export fix

This commit is contained in:
Dan Brown 2018-03-30 15:45:34 +01:00
commit cfdf5b93d9
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 2 additions and 2 deletions

View File

@ -6,7 +6,7 @@
<style>
@if (!app()->environment('testing'))
{!! file_get_contents(public_path('/css/export-styles.css')) !!}
{!! file_get_contents(public_path('/dist/export-styles.css')) !!}
@endif
.page-break {
page-break-after: always;

View File

@ -6,7 +6,7 @@
<style>
@if (!app()->environment('testing'))
{!! file_get_contents(public_path('/css/export-styles.css')) !!}
{!! file_get_contents(public_path('/dist/export-styles.css')) !!}
@endif
.page-break {
page-break-after: always;