From: Dan Brown <redacted>
Date: Sun, 16 Mar 2025 12:45:08 +0000 (+0000)
Subject: Merge branch 'development' into release
X-Git-Tag: v25.02.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/997931c42f1aad89724aee40cc6c75d8939bf0bc?hp=-c

Merge branch 'development' into release
---

997931c42f1aad89724aee40cc6c75d8939bf0bc
diff --combined .gitignore
index 15f8eeb6e,b545d161f..e0cc32295
--- a/.gitignore
+++ b/.gitignore
@@@ -8,10 -8,10 +8,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
@@@ -32,3 -32,4 +32,4 @@@ webpack-stats.jso
  phpstan.neon
  esbuild-meta.json
  .phpactor.json
+ /*.zip