Merge branch 'v0.20' into release

BookStackApp · Mar 30, 2018 · a0381f7 · a0381f7
2 parents 6102f66 + 3cd0838
commit a0381f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/resources/views/books/export.blade.php b/resources/views/books/export.blade.php
@@ -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;

diff --git a/resources/views/chapters/export.blade.php b/resources/views/chapters/export.blade.php
@@ -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;