From: Dan Brown <redacted>
Date: Fri, 29 Dec 2023 12:15:34 +0000 (+0000)
Subject: Merge branch 'development' into release
X-Git-Tag: v23.12~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/e86a90967ee6066e4e22986265b2a2825853e17d?hp=-c

Merge branch 'development' into release
---

e86a90967ee6066e4e22986265b2a2825853e17d
diff --combined .gitignore
index ede4fe296,55cc0557b..a8d2e6af7
--- a/.gitignore
+++ b/.gitignore
@@@ -7,10 -7,10 +7,10 @@@ Homestead.yam
  .idea
  npm-debug.log
  yarn-error.log
 -/public/dist
 +/public/dist/*.map
  /public/plugins
 -/public/css
 -/public/js
 +/public/css/*.map
 +/public/js/*.map
  /public/bower
  /public/build/
  /public/favicon.ico
@@@ -29,4 -29,5 +29,5 @@@ webpack-stats.jso
  .phpunit.result.cache
  .DS_Store
  phpstan.neon
- esbuild-meta.json
+ esbuild-meta.json
+ .phpactor.json