Merge branch 'Cyber-Duck-master'

This commit is contained in:
Dan Brown 2017-07-27 16:29:09 +01:00
commit 9d61eecd81
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
4 changed files with 6 additions and 6 deletions

View File

@ -56,7 +56,7 @@
<h1>{{$book->name}}</h1>
<div class="book-content" v-if="!searching">
<p class="text-muted" v-pre>{{$book->description}}</p>
<p class="text-muted" v-pre>{!! nl2br(e($book->description)) !!}</p>
<div class="page-list" v-pre>
<hr>

View File

@ -52,7 +52,7 @@
<div class="col-md-7">
<h1>{{ $chapter->name }}</h1>
<div class="chapter-content" v-if="!searching">
<p class="text-muted">{{ $chapter->description }}</p>
<p class="text-muted">{!! nl2br(e($chapter->description)) !!}</p>
@if(count($pages) > 0)
<div class="page-list">