From: Dan Brown <redacted>
Date: Sun, 26 Feb 2023 11:02:56 +0000 (+0000)
Subject: Merge branch 'development' into release
X-Git-Tag: v23.02~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/8c82aaabd6dd17da2e0f5231b0760dfb6f5dedf9

Merge branch 'development' into release
---

8c82aaabd6dd17da2e0f5231b0760dfb6f5dedf9
diff --cc .gitignore
index b5cd75f47,90b80e7b8..615013ff7
--- a/.gitignore
+++ b/.gitignore
@@@ -5,12 -5,13 +5,13 @@@ 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
  /storage/images
  _ide_helper.php
  /storage/debugbar
diff --cc version
index 717560bba,1a094928c..394a629ed
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v23.01.1
 -v23.02-dev
++v23.02-dev