From: Dan Brown <redacted>
Date: Wed, 2 Jun 2021 19:25:20 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/awarre/BookStack into awarre-master
X-Git-Tag: v21.05.1~1^2~10
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/40ca50e44f3ca0f648d915dc73ff205309730f07

Merge branch 'master' of https://github.com/awarre/BookStack into awarre-master
---

40ca50e44f3ca0f648d915dc73ff205309730f07
diff --cc app/Entities/Tools/PageContent.php
index ff502d164,b0c1f856f..2c9586265
--- a/app/Entities/Tools/PageContent.php
+++ b/app/Entities/Tools/PageContent.php
@@@ -4,7 -5,9 +5,10 @@@ use BookStack\Entities\Models\Page
  use BookStack\Entities\Tools\Markdown\CustomStrikeThroughExtension;
  use BookStack\Facades\Theme;
  use BookStack\Theming\ThemeEvents;
 +use BookStack\Util\HtmlContentFilter;
+ use BookStack\Uploads\Image;
+ use BookStack\Uploads\ImageRepo;
+ use BookStack\Uploads\ImageService;
  use DOMDocument;
  use DOMNodeList;
  use DOMXPath;